Merge branch 'master' of https://github.com/lichifeng/lcforum

Conflicts:
	.idea/dataSources.xml
	db.sqlite3