[Niall] - Adapter
[Niall] - Merge branch 'adapter2'

Conflicts:
	res/layout/activity_audio_player.xml
	src/com/example/mediaplayer/AudioPlayerActivity.java
	src/com/example/mediaplayer/FilesActivity.java
	src/com/example/mediaplayer/MainActivity.java