Añadiendo Tasks
Merge branch 'master' of https://github.com/quique0194/TiendaOnline

Conflicts:
	target/classes/pe/edu/ucsp/oms/controller/UserController.class
	target/classes/pe/edu/ucsp/oms/domain/Content.class
	target/classes/pe/edu/ucsp/oms/domain/MediaType.class
	target/classes/pe/edu/ucsp/oms/domain/Offer.class
	target/classes/pe/edu/ucsp/oms/domain/Purchase.class
	target/classes/pe/edu/ucsp/oms/domain/Role.class
	target/classes/pe/edu/ucsp/oms/repository/OfferDao.class
	target/classes/pe/edu/ucsp/oms/repository/PurchaseDao.class
	target/classes/pe/edu/ucsp/oms/repository/jdbc/JdbcContentDao$ContentMapper.class
	target/classes/pe/edu/ucsp/oms/repository/jdbc/JdbcContentDao.class
	target/classes/pe/edu/ucsp/oms/repository/jdbc/JdbcPurchaseDao$MediaContentMapper.class
	target/classes/pe/edu/ucsp/oms/repository/jdbc/JdbcPurchaseDao.class