android project structure with facebook sdk
Merge branch 'master' of https://github.com/MusicMe/MusicMe-android

Conflicts:
	.gitignore