NA
NA
Merge branch 'master' of https://github.com/willisdl/grails_gtunes

Conflicts:
	gTunes/grails-app/controllers/gtunes/StoreController.groovy
	gTunes/grails-app/views/store/genre.gsp
	gTunes/target-eclipse/classes/JQueryResourceTagLib.class
	gTunes/target-eclipse/classes/JQueryTagLib.class
	gTunes/target-eclipse/classes/grails/plugin/cache/CacheTagLib.class
	gTunes/target-eclipse/classes/grails/plugin/databasemigration/DbdocController.class
	gTunes/target-eclipse/classes/gtunes/Album.class
	gTunes/target-eclipse/classes/gtunes/AlbumController.class
	gTunes/target-eclipse/classes/gtunes/AlbumControllerTests.class
	gTunes/target-eclipse/classes/gtunes/AlbumTests.class
	gTunes/target-eclipse/classes/gtunes/Artist.class
	gTunes/target-eclipse/classes/gtunes/ArtistTests.class
	gTunes/target-eclipse/classes/gtunes/LoginCommand.class
	gTunes/target-eclipse/classes/gtunes/Song.class
	gTunes/target-eclipse/classes/gtunes/SongController.class
	gTunes/target-eclipse/classes/gtunes/SongControllerTests.class
	gTunes/target-eclipse/classes/gtunes/SongTests.class
	gTunes/target-eclipse/classes/gtunes/StoreController.class
	gTunes/target-eclipse/classes/gtunes/StoreControllerTests.class
	gTunes/target-eclipse/classes/gtunes/User.class
	gTunes/target-eclipse/classes/gtunes/UserController.class
	gTunes/target-eclipse/classes/gtunes/UserControllerTests.class
	gTunes/target-eclipse/classes/gtunes/UserTests.class
	gTunes/target-eclipse/classes/org/grails/plugin/resource/ResourceTagLib.class
	gTunes/target/classes/gtunes/StoreController.class
	gTunes/target/test-classes/unit/gtunes/AlbumControllerTests.class
	gTunes/target/test-classes/unit/gtunes/AlbumTests.class
	gTunes/target/test-classes/unit/gtunes/ArtistTests.class
	gTunes/target/test-classes/unit/gtunes/SongControllerTests.class
	gTunes/target/test-classes/unit/gtunes/SongTests.class
	gTunes/target/test-classes/unit/gtunes/StoreControllerTests.class
	gTunes/target/test-classes/unit/gtunes/UserControllerTests.class
	gTunes/target/test-classes/unit/gtunes/UserTests.class