#63
Merge branch 'dev' of https://github.com/aleksandersmierciak/ThesisChecker into dev

Conflicts:
	WebApplication/DAO/src/main/java/com/thesischecker/dao/impl/ResourcesDao.java
	WebApplication/DAO/src/main/java/com/thesischecker/dao/interfaces/IResourcesDao.java