Added Apache Velocity engine to the PDF reader.
Merge branch 'master' of https://github.com/polinankoleva/docmag

Conflicts:
	docmag/pom.xml
Merge branch 'master' of https://github.com/polinankoleva/docmag.git
Added a PDF controller.
Merge branch 'master' of https://github.com/polinankoleva/docmag
Extended UserService with methods from UserDAO.