merge
Merge branch 'master' of https://github.com/dreammoonstudio/web

Conflicts:
	app/templates/base.html
resolve conflict in base.html