Check database fixed - to be tested
Merge branch 'master' of https://github.com/dacappo/messenger

Conflicts:
	.idea/workspace.xml