Merge remote branch 'origin/2.1'

diff --cc doc/qtcreator.qdoc
Simple merge

diff --cc share/qtcreator/templates/shared/deployment.pri
Simple merge

diff --cc src/app/main.cpp
Simple merge

diff --cc src/plugins/projectexplorer/customwizard/customwizardparameters.cpp
Simple merge

diff --cc src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp
Simple merge