step closer to model ordering
Merge branch 'master' of https://github.com/freshpotatoe/motherplate

Conflicts:
	public/js/main.js