Merge Dev into Master

New server-side authentication script is functional.