codeship
Merge remote-tracking branch 'origin/master'
Merge branch 'develop'
 Bug fix succes url
 -mail fix