Commit from Pedro.
Merge branch 'master' of https://github.com/ninjaTurtlesUIO/production

Conflicts:
	Gruntfile.js
	app/views/main.html
	package.json
Removed duplicate Gruntfile.js.