hoanvk fixed layout, add more admin pages
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/Safety/SafetyStuffs/WicketApplication.java