para merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/an/dpr/manteniket/dao/BicisDAO.java
	src/main/java/an/dpr/manteniket/dao/IBikesDAO.java
	src/main/java/an/dpr/manteniket/domain/User.java
	src/main/java/an/dpr/manteniket/pages/ActivitiesPage.java
	src/main/java/an/dpr/manteniket/pages/BicisListPage.java
	src/main/java/an/dpr/manteniket/repository/BicisRepository.java
	src/main/resources/beans.xml
bugfixed