commit guarruno que no vale para merge
commit para hacer merge
Merge branch 'master' of https://github.com/rikidpr/manteniket.git

Conflicts:
	src/main/java/an/dpr/manteniket/pages/BicisListPage.java
	src/main/resources/META-INF/persistence.xml
	src/main/resources/an/dpr/manteniket/pages/BicisListPage.html
	src/main/resources/applicationContext.xml
interface, counts, listado usos modernizandose
BikeCompList with new ManteniketTable (sort is not ready)
bikeCompListPage sort ok
avances sort bikeusecomp