Added category_id column.
Merge remote branch 'origin/master' into pkovac
Merge remote branch 'origin/master' into pkovac
Merge remote branch 'origin/master' into pkovac
Added column to attribute database for parent ID.
Merge remote-tracking branch 'origin/master' into pkovac
Merge remote branch 'origin/master' into pkovac
Merge remote branch 'origin/master' into pkovac
Created SQLConfig class for new three-column format, in progress.
Added foreign key function to SQLUtils
Merge remote branch 'origin/master' into pkovac
Added method in SQLConfig for retrieving geometry names.
SQLConfig.getGeometryCollectionNames and SQLUtils.joinedSelectQuery now
seem to work.
Merge branch 'master' into pkovac
Added some support methods to SQLUtils for handling more complex conditional clauses in SQL statements.
insertRowReturnID for handling the description table works;
More work on cross-row-select.
Merge remote-tracking branch 'origin/master' into pkovac

Conflicts:
	WeaveServices/src/weave/config/DatabaseConfig.java
	WeaveServices/src/weave/config/sqlconfig.dtd
	WeaveServices/src/weave/utils/SQLUtils.java
Started on table property get/setter
Added documentation to joinedSelectQuery and made the parameter names
clear as to what it expects.  Refactored to expect qualified names
everywhere and added parameter for table alias names.
Merge branch 'master', remote-tracking branch 'origin' into pkovac
Refactored getFromKeyVals to operate separately on public and private property tables; Modified getGeometryCollectionNames to use getFromKeyVals.