Merge branch '5.1'
- Conflicts:
- app_templates/cpp/CMake/cmake_qt4core/cmake_qt4core.kdevtemplate
- app_templates/cpp/CMake/cmake_qt4core_qtest/cmake_qt4core_qtest.kdevtemplate
- app_templates/cpp/CMake/cmake_qt4gui/cmake_qt4gui.kdevtemplate
- app_templates/cpp/QMake/qmake_qt4guiapp/qmake_qt4guiapp.kdevtemplate