Update grunt. Add bower. Update .gitignore
Add singular functionality
Merge branch '1.5.1' into develop

Conflicts:
	bower.json