more text'n'stuff
Merge branch 'master' of github.com:GroupDenseKitchen/KitchenOccupation
Fixed references
Configuration in User manual
Merge branch 'master' of github.com:GroupDenseKitchen/project into BRACE_FOR_EPIC

Conflicts:
	conf/mainConfig.yml