conflict
Merge branch 'master' of https://github.com/polinankoleva/docmag

Conflicts:
	docmag/src/main/java/bg/unisofia/fmi/docmag/dao/impl/UserDAOImpl.java
fixed thesisproposal PUT