fixed an error_log error in reset_password.php
Merge branch 'dev' of https://github.com/ShelvAR/ShelvARApi into dev
fixing more errors from error log