Password reset is now working
Merge branch 'master' of https://github.com/kptnkrnch/MFUCS

Conflicts:
	Website/MegaFileUploadConversion/MegaFileUploadConversion/bin/MegaFileUploadConversion.dll
	Website/MegaFileUploadConversion/MegaFileUploadConversion/bin/MegaFileUploadConversion.pdb
	Website/MegaFileUploadConversion/MegaFileUploadConversion/obj/Debug/MegaFileUploadConversion.csprojResolveAssemblyReference.cache
	Website/MegaFileUploadConversion/MegaFileUploadConversion/obj/Debug/MegaFileUploadConversion.dll
	Website/MegaFileUploadConversion/MegaFileUploadConversion/obj/Debug/MegaFileUploadConversion.pdb
more commits...