fix route issues

Conflicts:
	js/config/app.js
	js/public/app.js
fix playing songs