view order & displayorder amend n addition
changed user activation so that form only displays when there isn't an active tablet
Merge branch 'master' of github.com:atib/tablet-gaylord
Login page and welcome page for client is now styled
styled registration page
added form when deactivation fails and removed continue button
menu being styled and fixed
menu styling changes
flash
Merge branch 'atib'

Conflicts:
	CSS/Main.css
	displayorder.php
	vieworder.php