Merge branch 'master' of
https://github.com/setvect/LiteratureBoy-Home.git

Conflicts:
	pom.xml
Merge branch 'master' of
https://github.com/setvect/LiteratureBoy-Home.git