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

Conflicts:
	main.lua