Updated User Class with necessary fields
Merge remote-tracking branch 'origin/Intranet_Registration' into Intranet_Registration

Conflicts:
	database_config.py
Updated User Class with necessary fields