setting changed
Merge branch 'master' of https://github.com/duzhangtech/theForce

Conflicts:
	templates/index.html
	theForce/views.pyc