version bump
minor updates
Merge branch 'master' of github.com:suprMax/express-boilerplate

Conflicts:
	package.json
Merge remote-tracking branch 'origin/master' into chaplin

Conflicts:
	Gruntfile.coffee
	app/client/app.coffee
	app/client/dependencies.coffee
	package.json