commit to resolve merge conflicts
updated junit tests to work with the new thread classes.  Updated a clean DB_export.sql file containing only 1 course, 18 holes, and 2 previously played games
forgot to actually run the export for the DB on the last commit--this is a commit of the updated DB_export.sql with a clean set of records
updated junit tests, and fixes. All methods in SQLQueries (and sub classes) are tested, except for getUserHistory().  An updated DB is also included
Merge branch 'master' into Greg-Branch