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

Conflicts:
	upon/website/static/js/main.js
	upon/website/templates/upon/main.html
Merge remote-tracking branch 'origin/0409'

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