fix
fix
add meerkat-database module
fix
add email module
Merge branch 'master' of https://github.com/aberdnikov/meerkat

Conflicts:
	composer.json