sql
Merge branch 'master' of https://github.com/hexacta/HexactaLabs-Java
DAO y Servicios del prestamos + Borrado Logico del BookCopy
Loans (DAO, Serv y WS) + Borrado Logico de Books

y country agregado en bookbuilder
Registro integrado
Bug en Borrar Libros solucionado
versiones nuevas
Merge branch 'mbuchwald-master'
	Merge branch 'fdoll-master'

Conflicts:
	dev/Tpl/src/main/java/ar/com/hexacta/tpl/model/User.java
	dev/Tpl/src/main/java/ar/com/hexacta/tpl/model/builder/BookBuilder.java
	dev/Tpl/src/main/java/ar/com/hexacta/tpl/persistence/dao/DataInitDAO.java
	dev/Tpl/src/main/java/ar/com/hexacta/tpl/persistence/dao/LoanDAO.java
	dev/Tpl/src/main/java/ar/com/hexacta/tpl/resource/UserWS.java
	dev/Tpl/src/main/java/ar/com/hexacta/tpl/service/ILoansService.java
	dev/Tpl/src/main/java/ar/com/hexacta/tpl/service/impl/LoansServiceImpl.java
	dev/Tpl/src/main/webapp/app/controller/createBookCtrl.js
	dev/Tpl/src/main/webapp/app/controller/deleteBookCtrl.js
	dev/Tpl/src/main/webapp/app/views/bookListPage.html
	dev/Tpl/src/main/webapp/css/site.css
hibernate 4
Merge branch 'master' of https://github.com/hexacta/HexactaLabs-Java

Conflicts:
	dev/Tpl/src/main/java/ar/com/hexacta/tpl/persistence/dao/CommentDAO.java
	dev/Tpl/src/main/java/ar/com/hexacta/tpl/resource/LoginWS.java
	dev/Tpl/src/main/java/ar/com/hexacta/tpl/resource/UserWS.java
	dev/Tpl/src/main/java/ar/com/hexacta/tpl/service/impl/BooksServiceImpl.java
	dev/Tpl/src/main/webapp/app/controller/editBookCtrl.js
Resuelto problema de edicion de categorias de un libro