4/9
Merge pull request #34 from fdoll/master

4/9 - Test de servicios terminados y libros ordenados
Merge branch 'mbuchwald-master'
Merge branch 'master' of https://github.com/hexacta/HexactaLabs-Java

Conflicts:
	dev/Tpl/src/main/webapp/app/views/bookListPage.html
Merge pull request #35 from mbuchwald/master

Correccion de tests y algunos servicios (user y loans)
Merge branch 'master' of https://github.com/hexacta/HexactaLabs-Java