edit/remove homepage admin
Merge branch 'master' of https://github.com/adrianamb91/panda

Conflicts:
	backend/WebContent/js/homepageAdmin.js
	backend/src/com/timesheetapplication/service/DepartmentService.java