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

Conflicts:
	WebContent/dashboard.jsp