fix for browser language routing for ZH
Merge branch 'master' of mcbbigram.cs.mcgill.ca:PHYLO

Conflicts:
	assets/scripts/AppController.js
bug fix for AppController

wont run because of error, fixed now