get latest code from git
Merge branch 'master' of https://github.com/meduri/Boilerplate

Conflicts:
	boilerplate/platforms/ios/BoilerPlate.xcodeproj/project.pbxproj

boilerplate/platforms/ios/BoilerPlate.xcodeproj/project.xcworkspace/xcus
erdata/admin.xcuserdatad/UserInterfaceState.xcuserstate
	boilerplate/platforms/ios/BoilerPlate/BoilerPlate-Info.plist
	boilerplate/platforms/ios/BoilerPlate/config.xml
	boilerplate/platforms/wp8/BoilerPlate.csproj
	boilerplate/www/config.xml
	boilerplate/www/cordova_plugins.js
	boilerplate/www/index.html
	boilerplate/www/js/index.js