Pull
Merge branch 'master' of https://github.com/quique0194/TiendaOnline

Conflicts:
	target/classes/pe/edu/ucsp/oms/controller/CategoryController.class
	target/classes/pe/edu/ucsp/oms/controller/ContentController.class
	target/classes/pe/edu/ucsp/oms/domain/Category.class
	target/classes/pe/edu/ucsp/oms/domain/Content.class
	target/classes/pe/edu/ucsp/oms/domain/Notification.class
	target/classes/pe/edu/ucsp/oms/domain/Payments.class
	target/classes/pe/edu/ucsp/oms/repository/jdbc/JdbcCategoryDao$CategoryMapper.class
	target/classes/pe/edu/ucsp/oms/repository/jdbc/JdbcCategoryDao.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/JdbcVoucherDao$VoucherMapper.class
	target/classes/pe/edu/ucsp/oms/repository/jdbc/JdbcVoucherDao.class
Pull
Merge branch 'master' of https://github.com/quique0194/TiendaOnline

Conflicts:
	target/tomcat/work/localEngine/localhost/TiendaOnline/SESSIONS.ser
Merge branch 'master' of https://github.com/quique0194/TiendaOnline