?
Merge branch 'refactor' of https://github.com/xran-deex/droidsonic into refactor

Conflicts:
	bin/classes/t/o/t/d/droidsonic/AlbumListFragment.class
	bin/classes/t/o/t/d/droidsonic/ArtistListFragment.class
	bin/classes/t/o/t/d/droidsonic/FolderList2Fragment.class
	bin/classes/t/o/t/d/droidsonic/FolderListFragment.class
	bin/classes/t/o/t/d/droidsonic/HomeScreenWidget.class
	bin/classes/t/o/t/d/droidsonic/LyricsFragment.class
	bin/classes/t/o/t/d/droidsonic/MainActivity.class
	bin/classes/t/o/t/d/droidsonic/NavFragment$1.class
	bin/classes/t/o/t/d/droidsonic/PlayerFragment$1.class
	bin/classes/t/o/t/d/droidsonic/PlayerFragment$4.class
	bin/classes/t/o/t/d/droidsonic/PlayerFragment$6.class
	bin/classes/t/o/t/d/droidsonic/PlayerFragment$8.class
	bin/classes/t/o/t/d/droidsonic/PlayerFragment.class
	bin/classes/t/o/t/d/droidsonic/PlayerService.class
	bin/classes/t/o/t/d/droidsonic/R$color.class
	bin/classes/t/o/t/d/droidsonic/R$id.class
	bin/classes/t/o/t/d/droidsonic/R$integer.class
	bin/classes/t/o/t/d/droidsonic/R$layout.class
	bin/classes/t/o/t/d/droidsonic/R$menu.class
	bin/classes/t/o/t/d/droidsonic/R$string.class
	bin/classes/t/o/t/d/droidsonic/R$style.class
	bin/classes/t/o/t/d/droidsonic/R$styleable.class
	bin/classes/t/o/t/d/droidsonic/R$xml.class
	bin/classes/t/o/t/d/droidsonic/SongListFragment.class
	gen/t/o/t/d/droidsonic/R.java
??