changed routes
Merge branch 'master' into david-test

Conflicts:
	server/manager/manager_topic.js
	server/routes/routes_topic.js
Merge Branch david