Post-merge with master
updates DEV_LOG.txt
Touches up documentation in upload_handler.php
Adds documentation to admin.php
Improvises on password reset
Merges the update from mvc_temp