cleanup launcher.php
Merge branch 'master' of https://github.com/FNNDSC/chrisreloaded

Conflicts:
	controller/launcher.php