ordering backup/restore bug fixes
Merge branch 'master' of https://github.com/lorencs/Ualberta-Assessment-Tool-Prototype

Conflicts:
	db_setup.sql
	design/design.css
	media/item39/1.jpg
	php/classes/ItemBlanks.php