added to service and resource delete and find by code methods, fixed code attribute issues
Merge remote-tracking branch 'origin/admin' into admin

Conflicts:
	src/main/webapp/WEB-INF/pages/admin/courses/create_courses.ftl
	src/main/webapp/resources/messages_en.properties
update hotfix