16:00
Merge branch 'master' of https://github.com/CatRubenJoan/Restaurant

Conflicts:
	Restaurant-war/src/java/controllers/servTestJoan.java
	nbproject/private/private.properties
	nbproject/project.properties