# downgrade all mysql tables from utf8mb4 to utf8 to be compatible with mysql < 5.5
# prepare for merging master
Merge branch 'master' into conversations

Conflicts:
	db_layout_version.php
# changed conversation tables from utf8mb4 to utf8