hackaton: sync the work
Merge branch 'master' of ssh://pragres.com/git/com.fishagift

Conflicts:
	packages/email/model/Email.php
Merge branch 'master' of ssh://pragres.com/git/com.fishagift