extend

extend
Merge branch 'master' of https://github.com/kirkurg/AndroidApp

Conflicts:
	Android/.metadata/.log

	Android/.metadata/.plugins/org.eclipse.core.resources/.projects/MusicApp/.indexes/properties.index

	Android/.metadata/.plugins/org.eclipse.core.resources/.projects/MusicApp/.markers

	Android/.metadata/.plugins/org.eclipse.core.resources/.projects/MusicApp/org.eclipse.jdt.core/state.dat

	Android/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index

	Android/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	Android/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi