update
Merge branch 'master' of https://github.com/BSerg/proshumolitv

Conflicts:
	db.sqlite3
	reminders/models.py