Updated Express to Express 4 and fixed some inconsistencies)
Testing!
Merge branch 'master' of github.com:YRSNorwich/enterpriser into feature/stockgrab

Conflicts:
	app.js
	package.json
Made really big changes to core files! Let's hope it doesn't all break :x