timeline screen expandable list adapter
Merge branch 'master' of
https://github.com/MobileMusic/MobileAudioWorkstation.git

Conflicts:
	MobileAudioWorkstation/res/layout/activity_main.xml
	MobileAudioWorkstation/src/com/mobilemusic/mobileaudioworkstation/MainActivity.java