company
Merge branch 'master' of https://github.com/MaximeGuilloreau/computer-database

Conflicts:
	src/com/computer/database/controller/ComputerController.java
	src/com/computer/database/dao/manager/DaoManager.java