For old server change actions change-password to change_password
and 'recover' to 'recovery'. Removed unused API::VERSION.
Added the recovery dialog back in :)
Merge remote-tracking branch 'upstream/master'