usuarios
interfaces
movidas varias
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/an/dpr/manteniket/domain/Component.java
	src/main/java/an/dpr/manteniket/pages/BikeCompListPage.java
	src/main/resources/beans.xml