Big updates
Merge branch 'master' of github.com:drod2169/MusicStore

Conflicts:
	grails-app/controllers/testapp/StoreController.groovy
	grails-app/domain/testapp/User.groovy
Fix mistake
Fix merge error