merged from master
Custom navbar, footer and table fixes
Merge branch 'master' of https://github.com/GeeksException/softtech

Conflicts:
	src/main/webapp/WEB-INF/views/admin.html
	src/main/webapp/WEB-INF/views/admin/index.html