update to latest browser
Merge branch 'master' of https://github.com/yuanwang1980/cathay

Conflicts:
	js/main.js