Merge branch 'hotfix-devise-email'
Merge branch 'release-1.2.0'
Merge branch 'release-1.2.1'
Merge branch 'release-1.3.0'
bad replace
bump bump
Merge branch 'release-1.3.1'
Merge branch 'release-1.3.1' into develop
quick fix
Merge branch 'hotfix-grammer-fix'
Merge branch 'hotfix-grammer-fix' into develop
adding some goodness
Merge branch 'hotfix-grammer-add'
Merge branch 'hotfix-grammer-add' into develop
better emails
Merge branch 'hotfix-mailer-subject' into develop