update
Merge branch 'master' of github.com:filiperp/filiperp_project_skeleton

Conflicts:
	Test/bin/Test.swf
	Test/src/Main.as
	Utils/src/crypto/SHA1.as
	libs/SCORMUtils.swc
	libs/Utils.swc
	output/app/main.swf
small fix