Merge branch 'mer-3.1' into next

Notes
 - Compiles w/o error; launch&quit possible.
 - dist/gdb/ resolved by resetting to next, i.e., kept our version which
   also matches Mer version
 - src/tools/sdktool/ resolved by resetting to mer-3.1, i.e.,
   temporarily throwing out our changes - will be rewritten later.

Conflicts:
	dist/gdb/Makefile.linux
	dist/gdb/Makefile.mingw
	dist/gdb/Makefile.osx
	dist/gdb/patches/pythonhome-7.4_linux.patch
	doc/src/android/creator-android-app-tutorial.qdoc
	doc/src/linux-mobile/creator-publish-maemo-extras-devel.qdoc
	doc/src/linux-mobile/meegodev.qdoc
	doc/src/overview/creator-advanced.qdoc
	doc/src/overview/creator-deployment-ovi.qdoc
	doc/src/overview/creator-mobile-targets.qdoc
	doc/src/overview/creator-target-platforms.qdocinc
	doc/src/overview/creator-tutorials.qdoc
	doc/src/projects/creator-projects-overview.qdoc
	doc/src/projects/creator-projects-running.qdoc
	doc/src/qnx/creator-deployment-qnx.qdoc
	doc/src/qnx/creator-developing-qnx.qdoc
	doc/src/qtcreator.qdoc
	scripts/deployqtHelper_mac.sh
	share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri
	share/qtcreator/static.pro
	src/app/main.cpp
	src/plugins/coreplugin/editormanager/editormanager.cpp
	src/plugins/plugins.pro
	src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
	src/plugins/qt4projectmanager/makestep.cpp
	src/plugins/qtsupport/gettingstartedwelcomepage.cpp
	src/plugins/qtsupport/qtsupport.pro
	src/tools/sdktool/adddeviceoperation.cpp
	src/tools/sdktool/adddeviceoperation.h
	src/tools/sdktool/main.cpp
	src/tools/sdktool/rmdeviceoperation.cpp
	src/tools/sdktool/rmdeviceoperation.h
	src/tools/sdktool/settings.cpp
	src/tools/tools.pro