merged with trunk changes
Merge branch 'ui' of https://github.com/CatalystApps/StarlingGAFPlayer into ui