Change
Merge branch 'master' of https://github.com/anidev/612-2013
Merge branch 'master' of https://github.com/anidev/612-2013
Merge branch 'master' of https://github.com/anidev/612-2013

Conflicts:
	launcher.cpp