#63 Final version
Merge commit '9ff643f87eb191c2a00833c72ca30bf32e2be058' into dev

Conflicts:
	WebApplication/DAO/src/main/java/com/thesischecker/dao/impl/ResourcesDao.java
	WebApplication/DTO/src/main/java/com/thesischecker/dto/ResourceEntity.java
	WebApplication/DTO/src/main/java/com/thesischecker/dto/UserEntity.java
	WebApplication/app-web/src/main/webapp/WEB-INF/jsp/resources/index.jsp
	WebApplication/app-web/src/main/webapp/resources/js/custom.js