一些简单改动
Merge branch 'feature-template-organizing' of github.com:nervouna/ancientapps into feature-template-organizing

Conflicts:
	app/models.py
	app/templates/single_beta.html
	app/views.py