Added LastPlayed and Queue LinearLayouts to the MainActivity.
Added LastPlayed and Queue LinearLayouts to the MainActivity.
Merge branch 'master' into singleActivity

Conflicts:
	src/Android-app.iml
	src/res/drawable-xhdpi/ic_menu_share.png
	src/src/io/r/a/dio/ApiPacket.java
	src/src/io/r/a/dio/ApiUtil.java
	src/src/io/r/a/dio/MainActivity.java
	src/src/io/r/a/dio/Tracks.java