Create a "models" directory for model logic and move some files
Move all routes into app.js
Add basic tests for the app itself
Merge branch 'master' into ux

Conflicts:
	public/client.css
	public/stylesheets/style.css
	public/stylesheets/style.less