Pagination
Merge branch 'master' of https://github.com/estelleng/computer-database

Conflicts:
	src/com/formation/jee/dao/ComputerDao.java