college changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	__pycache__/incorrect_current_password_dialog.cpython-34.pyc
	__pycache__/login_dialog.cpython-34.pyc
	__pycache__/login_error_dialog.cpython-34.pyc
	__pycache__/password_changed_dialog.cpython-34.pyc
	__pycache__/password_mismatch_dialog.cpython-34.pyc
	__pycache__/radio_button_dialog_class.cpython-34.pyc
	main_menu_UI.py