...
Merge branch 'master' of https://github.com/xmduhan/qisite

Conflicts:
	db.sqlite3