Add Genre model (not quite sure how I missed this file :P)
Added Genre to Track.

Also replaced lengthy Track constructor with a Builder to make it clear
what the params are when creating a Track object.
Ensure a default genre exists when server upgrades
Removed query() method from database classes

query() was returning a ResultSet from an executed Statement, but was not
explicitly closing the Statement (it was going out of scope) and this
causes issue with SQLite and MySQL.

It's good practice to explicitly close Statements when finished with them
(and ResultSet's too, though closing Statements also closes the ResultSet)

Also fixed a few issues with adding the genre entity to the data model and
a few broken tests
Add api endpoint for Genres.  Fix bug with SQL in Genre
Merge branch 'master' into add-genre

Conflicts:
	src/com/pugh/sockso/music/DBCollectionManager.java
Merge branch 'master' into add-genre
Merge branch 'master' into add-genre
Fix incorrect method call
Merge pull request #121 from nperrier/add-genre

Add genre to data model and API.  No UI changes changes yet.