add routing
Merge remote-tracking branch 'origin/client' into client
Merge remote-tracking branch 'origin/client' into i18n

Conflicts:
	index.html
	js/module.js
	views/player.html
Merge remote-tracking branch 'origin/client' into i18n

Conflicts:
	index.html
	js/module.js
	views/player.html