Remove empty route and controller
Merge remote-tracking branch 'upstream/master'

Conflicts:
	public/app/routes/application.js