minor stuffs
Merge branch 'master' of github.com:suprMax/expressjs-boilerplate

Conflicts:
	app/javascripts/server/base/controller.coffee