test

test
Merge branch 'micheal'

Conflicts:
	app/frontend/static/js/dataTables.editor.bootstrap.js
	app/frontend/templates/order.html
	app/views.py
	wmstest.db
Revert b9faffa..e3b65f0

This rolls back to commit b9faffa2e15e63ab1c1062bf979a096bc5a786f4.