navigation stuff
Merge branch 'master' of https://github.com/lorencs/Ualberta-Assessment-Tool-Prototype

Conflicts:
	php/classes/ItemDragndrop.php