Show the AUX view on AudioListActivity
Merge branch 'master' of https://github.com/2014-1/001

Conflicts:
	MainProject/res/layout/audio_list_view.xml