Fixed whitebox diagram being renamed
Merge branch 'master' of https://github.com/Contramalgra/java

Conflicts:
	docs/testCases.tex
Forgot Password button at least tells the user something now
Blocked accounts can't log in - closes #206
Account deletion fix (#208), other misc changes

Fixed the account deletion by changing the way the modify accounts
combo box updates. Added parameters to some course selection constructors
to create functionality for how they will eventually work. Added some
functionality and changes to some formatting and to the database classes.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/database/AccountAccess.java
Merge pull request #209 from itpun/master

fixed Delete button and removed need of start
Intermediate Marking page
Merge pull request #210 from graemesmth/master

Intermediate Marking page
Merge pull request #211 from itpun/master

activity submission/modification now has pop ups
Minor updates to DB access classes
CreateCourse has dropdown boxes for Instructor and TA

- They don't populate yet, though.
Added logo to login screen

Recreated login screen so that it's editable in netbeans.
More intermediate changes for Activity Page
Added textfiles for testing marking page
Marking Page Variant: PDF
Renames as per conventions
Updated more naming
Updates to activity management
Merge remote-tracking branch 'origin/master'