half commit
Merge branch 'master' of github.com:tiant167/upon

Conflicts:
	upon/website/static/js/main.js