chatAllowed & positionVisible
Merge remote-tracking branch 'origin/master'

Conflicts:
	Model/src/main/resources/applicationContext.xml
	Model/src/test/java/be/kdg/trips/TestTrip.java
Merge remote-tracking branch 'origin/master'