Added security annotations
Merge branch 'master' into roles-fixes

Conflicts:
	src/main/java/rest/EmployeeResource.java
	src/main/java/rest/TeacherResource.java