fixing git issues
Re-uploading Jon's gitignore, with my personal changes added in.
re uploading
hope this works ok, stupid db files...
some additional error handling, progress on new cohort functionality
Implementd a get all staff method
Updated to get staff data from database
Added error handling for when no cohort is loaded.
Added more error handling to deal with no database being loaded
Added a space in get student full name.
Implemented method getStudentByID.
PopulateEditStudent now uses data from the database.
student editing should now save changes. Supervisor list should be
populated.
Fixed bug in validation of doubles
Added more user feedback to editing students.
Added more data to display in the student report. Should work once Jon
implements some more methods.
bigger icon
Working edit assessment tab.
fingers crossed 2......
fingers crossed 3......
Merge branch 'gui' into develop

Conflicts:
	.gitignore
	src/gui/Data.java
	src/gui/DisplayCE_PopulateEditAssessment.java
	src/gui/DisplaySettings_PopulateBackupRestore.java
	src/gui/MainUI.java
	src/gui/PopupWindow.java
	src/orm/BaseStudent.java
Johns Icon