Edited homepage
Save shape in the db
Merge branch 'master' of https://github.com/lucatrincauk/mns-hackhaton

Conflicts:
	app/scripts/controllers/addIdea.js