test
change login template
Merge branch 'master' of https://github.com/junyangchen/bixplorer

Conflicts:
	static/common/js/common.js
	templates/home/index.html