Merge branch 'master' into express
Merge branch 'master' into express
Merge branch 'master' into express
Using new Common.defer
Merge branch 'express' into bookshelf-express

Conflicts:
	src/node-template.coffee
Don't need to call promise as function
Merge branch 'express' into bookshelf-express

Conflicts:
	src/node-template.coffee