removed platforms
Merge branch 'master' of https://github.com/1upon0/mobile

Conflicts:
	cordova_proj/.gitignore