#54 hack
Merge branch 'master' into issue/54

Conflicts:
	ios/robovm.properties
Merge branch 'issue/54', fixes #54