merged
Merge branch 'master' of
https://github.com/CatalystApps/StarlingGAFPlayer.git

Conflicts:
	gaf/bin/gaf.swc
files and folders conversion