Chat controller for android added
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/be/kdg/controller/rest/ChatRestController.java
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'