version 1.0 OK 22/01/2014
27/02/2014 10.07
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/be/vdab/web/BestellingController.java