no message
Merge branch 'master' of https://github.com/AmitsProduction/MoviesApp

Conflicts:
	platforms/ios/MoviesApp.xcodeproj/project.pbxproj
	platforms/ios/MoviesApp/config.xml
	platforms/ios/www/cordova_plugins.js
	plugins/ios.json