My commits
Merge branch 'master' of https://github.com/choucalate/music

Conflicts:
	.classpath
	.project
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/MidiSheetMusic.apk
	bin/dexedLibs/android-support-v4-12a5688deb9a9b7ca20a682f52227b5a.jar
	bin/jarlist.cache
	bin/resources.ap_
	libs/android-support-v4.jar
	project.properties
	res/animator/fade_in.xml
	res/animator/fade_out.xml
	res/animator/falling.xml
	res/animator/hyperspace_in.xml
	res/animator/hyperspace_out.xml
	res/animator/push_left_in.xml
	res/animator/push_left_out.xml
	res/animator/push_up_in.xml
	res/animator/push_up_out.xml
	res/drawable/btn_events.xml
	res/drawable/btn_friends.xml
	res/drawable/btn_messages.xml
	res/drawable/btn_newsfeed.xml
	res/drawable/btn_photos.xml
	res/drawable/btn_places.xml
	res/layout/actionbar_layout.xml
	res/layout/activity_main.xml
	res/layout/activity_test.xml
	res/layout/activity_tutorial_ms.xml
	res/layout/dashboard_layout.xml
	res/layout/footer_layout.xml
	res/layout/fragment_layout.xml
	res/layout/mspiano.xml
	res/layout/rowlayout.xml
	res/menu/activity_main.xml
	res/menu/activity_test.xml
	res/menu/activity_tutorial_ms.xml
	res/values/strings.xml
	src/com/midisheetmusic/AndroidDashboardDesignActivity.java
	src/com/midisheetmusic/ChooseSongActivity.java
	src/com/midisheetmusic/DashboardLayout.java
	src/com/midisheetmusic/FileUri.java
	src/com/midisheetmusic/IconArrayAdapter.java
	src/com/midisheetmusic/LevelActivity.java
	src/com/midisheetmusic/LevelArrayAdapter.java
	src/com/midisheetmusic/NotesExperimentActivity.java
	src/com/midisheetmusic/Piano.java
	src/com/midisheetmusic/SPPlayer.java
	src/com/midisheetmusic/SheetMusicActivity.java
	src/com/midisheetmusic/TutorialMSActivity.java
	src/com/testmusic/LoginFragment.java
	src/com/testmusic/NBNode.java
	src/com/testmusic/PianoThread.java