went back to previous version
Merge branch 'master' of https://github.com/meduri/Boilerplate

Conflicts:
	boilerplate/platforms/ios/BoilerPlate.xcodeproj/project.pbxproj
	boilerplate/platforms/ios/BoilerPlate.xcodeproj/project.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate
	boilerplate/platforms/ios/BoilerPlate/BoilerPlate-Info.plist
	boilerplate/platforms/ios/BoilerPlate/config.xml
	boilerplate/platforms/ios/cordova/clean
	boilerplate/platforms/ios/cordova/emulate
	boilerplate/platforms/ios/cordova/lib/install-device
	boilerplate/platforms/ios/cordova/lib/install-emulator
	boilerplate/platforms/ios/cordova/lib/list-devices
	boilerplate/platforms/ios/cordova/lib/list-emulator-images
	boilerplate/platforms/ios/cordova/lib/list-started-emulators
	boilerplate/platforms/ios/cordova/lib/sim.applescript
	boilerplate/platforms/ios/cordova/lib/start-emulator
	boilerplate/platforms/ios/cordova/log
	boilerplate/platforms/ios/cordova/run
	boilerplate/platforms/ios/cordova/version
	boilerplate/platforms/ios/www