properly fall back to test key
Modifying the public page to look similiar to the main web page
Merge branch 'master' of github.com:MokshaBirk/ehsm-ticketing

Conflicts:
	resources/public/css/ehsm.css