Most recent updates: user password change, removal of global variables, admin user view all files/filesizes, command line arg of server ip address
Merge remote-tracking branch 'origin/master'