User class updated with necessary fields and constants
Updated User Class to contain all required fields
Merge remote-tracking branch 'origin/Intranet_Registration' into Intranet_Registration

Conflicts:
	cuorewebpage/Views/Registration_View.py
	database_config.py
Updated User Class with necessary fields
Merge remote-tracking branch 'origin/Intranet_Registration' into Intranet_Registration
Updated User Class with necessary fields