Fixed various bugs
Merge branch 'master' of https://github.com/petmakris/thesis-webapp-spring-angularjs

Conflicts:
	src/main/java/gr/uoa/di/scan/thesis/service/GenericServiceBase.java