Separated routes
Removed dead code
Better query
Merge remote-tracking branch 'upstream/master'

Conflicts:
	modules/server/router.js
Merge remote-tracking branch 'upstream/master'