Merge pull request #2 from MadeByDiesel/development

Development
Merge pull request #3 from MadeByDiesel/development

Additional model hot fixes
Merge pull request #4 from MadeByDiesel/development

Development
Merge pull request #5 from MadeByDiesel/development

Development
Merge branch 'development'
hotfix artist form
hotfix enviroment
Delete development.rb
hotfix enviroments
Merge branch 'master' of github.com:MadeByDiesel/Music-Cloud-

Conflicts:
	config/environments/development.rb
Merge branch 'master' into development