Merge pull request #13 from youarehero/dev

add dev/master travis images to readme
fix password reset mail
Merge pull request #14 from RaphaelKimmig/hotfix

fix password reset mail
fix password reset email
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master' into dev