fuck it
merge
remove old stuff

Conflicts:
	app/scripts/app.js
	app/views/main.html
	platforms/ios/www/index.html
	www/index.html