adding/refactor new message controller
Merge branch 'demo_tour'