erro button manager
Merge branch 'master' of https://github.com/filiperp/filiperp_project_skeleton

Conflicts:
	libs/SCORMUtils.swc
	libs/Utils.swc
	output/app/main.swf