remove org controller
Merge remote-tracking branch 'origin/0.5' into 0.5
Merge remote-tracking branch 'origin/0.5' into 0.5
password reset fix
Merge pull request #163 from thomasalrin/0.5

password reset fix