First push of bug fix to staging
Remove local copy of source files before import
Correct remote source file loading
Merge branch 'master' into v0.6_dev

Conflicts:
	Gemfile.lock
Corrrect source file loading
Import music genres on albums