Fixed macros
Merge branch 'master' of https://github.com/yeah568/project-launch

Conflicts:
	launch.js