Added the ChatController and some mappings, default generated files included
Merge remote-tracking branch 'origin/master'