am adaugat rest, sefa
Merge branch 'master' of
https://github.com/sorinanistorescu/timesheet.git

Conflicts:
	timesheet/WebContent/WEB-INF/applicationContext.xml
	timesheet/WebContent/WEB-INF/timesheet-servlet.xml
	timesheet/WebContent/WEB-INF/web.xml
	timesheet/src/com/timesheet/controllers/AdministratorController.java