Added new features.
Merge branch 'develop' of https://github.com/web-candy/velobox into develop

Conflicts:
	src/main/java/app/controllers/ProdukteController.java