Merge branch 'hotfix-1.0.2'
Merge branch 'release-1.1.0'
devise from email address set
Merge branch 'hotfix-devise-email' into develop
added daily digest