save commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	sql/quizpic_smj.db
save commit