sql
Merge branch 'master' of https://github.com/esterr/CMS

Conflicts:
	CMS.db.sqlite3