add service to manifest and create music service file
add service to manifest and create music service file
update manifest with correct service path, service working within its lifecycle
successful service code, add button in playlist activity
Merge branch 'master' into music_library_service
refactor MusicLibrary -> MusicLibraryService
media library works with media wrapper
code cleanup, add updateLibrary
log song info
Merge branch 'master' of github.com:ejohnson44/fanClub into music_library_service

Conflicts:
	fanClub/res/layout/activity_playlist.xml
	fanClub/src/com/lastcrusade/fanclub/LandingActivity.java
	fanClub/src/com/lastcrusade/fanclub/PlaylistActivity.java
Merge branch 'master' into music_library_service
remove code that breaks on playlist
music library works with fragment
add bluetooth util to get name
userlist no longer static, customApplication, loop through colors on userlist, still needs polish
remove unused import warnings
Merge branch 'master' into music_library_service

Conflicts:
	fanClub/src/com/lastcrusade/fanclub/CoreActivity.java
	fanClub/src/com/lastcrusade/fanclub/MusicLibraryFragment.java
	fanClub/src/com/lastcrusade/fanclub/PlaylistFragment.java
	fanClub/src/com/lastcrusade/fanclub/util/MusicListAdapter.java
use getlocalbluetoothname in library fragment
code cleanup
Merge pull request #23 from reidbaker/music_library_service

Music library service