done
Merge branch 'teoy-dev'

Conflicts:
	ftalk/mojits/ftalk/controller.server.js
	ftalk/routes.json