project setup
Merge branch 'setup-project'

Conflicts:
	myApp/platforms/ios/cordova/console.log
	myApp/platforms/ios/www/templates/contact.html
Merge branch 'master' of https://github.com/sparcbvba/app201408