Merge branch 'master' of https://github.com/leecrossley/appsassin

Conflicts:
	config/express.js
	package.json