Changed master comment
Changed master comment again
Merge branch 'master' into development

Conflicts:
	main.lua