Merge remote-tracking branch 'dean/master'
Finished adding new Modality table
Updating TODO file
Adding new UserHasModality joining table
Replacing std::string::compare() with == where possible
Merge remote-tracking branch 'patrick/master'