Layout generator
Merge branch 'master' of github.com:sendwithus/resources

Conflicts:
	Gruntfile.js
	app/index.html
	app/styles/main.less