fix make ios

Conflicts:
	Makefile
	release/ios/config.xml
Merge branch 'master' into ionic

Conflicts:
	Makefile
	release/ios/config.xml