commit
commit
Merge branch 'master' of https://github.com/tgioihan/PlayOTA

Conflicts:
	bin/AndroidManifest.xml
	bin/PlayOTA.apk
	bin/classes.dex
	bin/classes/com/appota/playota/HomeFragment$1.class
	bin/classes/com/appota/playota/HomeFragment.class
	bin/classes/com/appota/playota/ManagerFragment$MyReceiver.class
	bin/classes/com/appota/playota/ManagerFragment.class
	bin/classes/com/appota/playota/MoreActivity.class
	bin/classes/com/appota/playota/MoreAddActivity$GetSiteAsync.class
	bin/classes/com/appota/playota/MoreAddActivity.class
	bin/classes/com/appota/playota/MusicPlayer$1.class
	bin/classes/com/appota/playota/MusicPlayer$2.class
	bin/classes/com/appota/playota/MusicPlayer$3.class
	bin/classes/com/appota/playota/MusicPlayer$4.class
	bin/classes/com/appota/playota/MusicPlayer$5.class
	bin/classes/com/appota/playota/MusicPlayer$6.class
	bin/classes/com/appota/playota/MusicPlayer$7.class
	bin/classes/com/appota/playota/MusicPlayer$8.class
	bin/classes/com/appota/playota/MusicPlayer$9.class
	bin/classes/com/appota/playota/MusicPlayer$GetSites.class
	bin/classes/com/appota/playota/MusicPlayer$UpdateSongDuration$1.class
	bin/classes/com/appota/playota/MusicPlayer$UpdateSongDuration$2.class
	bin/classes/com/appota/playota/MusicPlayer$UpdateSongDuration.class
	bin/classes/com/appota/playota/MusicPlayer.class
	bin/classes/com/appota/playota/PlaylistDetailFragment$1.class
	bin/classes/com/appota/playota/PlaylistDetailFragment$MyReceiver.class
	bin/classes/com/appota/playota/PlaylistDetailFragment.class
	bin/classes/com/appota/playota/PlaylistFragment$1.class
	bin/classes/com/appota/playota/PlaylistFragment$MyReceiver.class
	bin/classes/com/appota/playota/PlaylistFragment.class
	bin/classes/com/appota/playota/R$drawable.class
	bin/classes/com/appota/playota/R$id.class
	bin/classes/com/appota/playota/R$layout.class
	bin/classes/com/appota/playota/R$menu.class
	bin/classes/com/appota/playota/R$string.class
	bin/classes/com/appota/playota/R$style.class
	bin/classes/com/appota/playota/RootActivity.class
	bin/classes/com/appota/playota/UILApplication.class
	bin/classes/com/appota/playota/WebViewActivity$2.class
	bin/classes/com/appota/playota/WebViewActivity$3.class
	bin/classes/com/appota/playota/WebViewActivity$4.class
	bin/classes/com/appota/playota/WebViewActivity$GetDirectLinkAsync.class
	bin/classes/com/appota/playota/WebViewActivity$MWebViewClient.class
	bin/classes/com/appota/playota/WebViewActivity.class
	bin/classes/com/appota/playota/adapter/AllPlaylistAdapter$ViewHolder.class
	bin/classes/com/appota/playota/adapter/AllPlaylistAdapter.class
	bin/classes/com/appota/playota/adapter/AlphabetAdapter$1$1.class
	bin/classes/com/appota/playota/adapter/AlphabetAdapter$1$4.class
	bin/classes/com/appota/playota/adapter/AlphabetAdapter$1$5.class
	bin/classes/com/appota/playota/adapter/AlphabetAdapter$1.class
	bin/classes/com/appota/playota/adapter/AlphabetAdapter$ViewHolder.class
	bin/classes/com/appota/playota/adapter/AlphabetAdapter.class
	bin/classes/com/appota/playota/adapter/CurrentListSongsAdapter.class
	bin/classes/com/appota/playota/adapter/DownloaddingAdapter.class
	bin/classes/com/appota/playota/adapter/IndexAdapter.class
	bin/classes/com/appota/playota/adapter/MoreAddSiteAdapter.class
	bin/classes/com/appota/playota/adapter/PlaylistDetailAdapter$ViewHolder.class
	bin/classes/com/appota/playota/adapter/PlaylistDetailAdapter.class
	bin/classes/com/appota/playota/adapter/SiteAdapter.class
	bin/classes/com/appota/playota/adapter/SpinnerAdapter.class
	bin/classes/com/appota/playota/adapter/ViewPagerAdapter.class
	bin/classes/com/appota/playota/api/Album.class
	bin/classes/com/appota/playota/database/DatabaseHelper$SiteTable$Column.class
	bin/classes/com/appota/playota/database/DatabaseHelper$SiteTable.class
	bin/classes/com/appota/playota/database/DatabaseHelper.class
	bin/classes/com/appota/playota/network/HttpHelper.class
	bin/classes/com/appota/playota/network/HttpUtils.class
	bin/classes/com/appota/playota/network/JsonUtil.class
	bin/classes/com/appota/playota/service/MusicService$1.class
	bin/classes/com/appota/playota/service/MusicService$2.class
	bin/classes/com/appota/playota/service/MusicService$3.class
	bin/classes/com/appota/playota/service/MusicService$ServiceAction.class
	bin/classes/com/appota/playota/service/MusicService$musicCompletionListener$1.class
	bin/classes/com/appota/playota/service/MusicService$musicCompletionListener.class
	bin/classes/com/appota/playota/service/MusicService.class
	bin/classes/com/appota/playota/util/CommonUtils.class
	bin/classes/com/appota/playota/util/PlayOTAUtil.class
	bin/classes/com/appota/playota/util/StringMatcher.class
	bin/classes/com/appota/view/widget/Footer$1.class
	bin/classes/com/appota/view/widget/Footer$2.class
	bin/classes/com/appota/view/widget/Footer$3.class
	bin/classes/com/appota/view/widget/Footer$4.class
	bin/classes/com/appota/view/widget/Footer$5.class
	bin/classes/com/appota/view/widget/Footer.class
	bin/classes/com/appota/view/widget/Header.class
	bin/classes/com/appota/view/widget/PagerContainer.class
	bin/classes/com/appota/view/widget/VPagerContainer.class
	bin/classes/com/appota/view/widget/VerticalViewPager$SavedState.class
	bin/classes/com/appota/view/widget/VerticalViewPager.class
	bin/classes/com/yyxu/download/http/AndroidHttpClient.class
	bin/classes/com/yyxu/download/http/HttpDateTime.class
	bin/classes/com/yyxu/download/services/DownloadManager$TaskQueue.class
	bin/classes/com/yyxu/download/services/DownloadManager.class
	bin/classes/com/yyxu/download/services/DownloadService.class
	bin/classes/com/yyxu/download/services/DownloadTask.class
	bin/classes/com/yyxu/download/services/TrafficCounterService.class
	bin/classes/com/yyxu/download/utils/MyIntents$Types.class
	bin/classes/com/yyxu/download/utils/NetworkUtils.class
	bin/classes/com/yyxu/download/utils/StorageUtils.class
	bin/dexedLibs/acra-4.4.0-31a3407f19e206438a4fce04ed13c040.jar
	bin/dexedLibs/android-support-v4-99d4f81e9e063d31b4914fc2869295cb.jar
	bin/dexedLibs/android-viewbadger-489b399eb80dba3f4d76ae1bae49d872.jar
	bin/dexedLibs/gson-2.2.2-282d9b9da5309a1deba89b111bcd7096.jar
	bin/dexedLibs/libGoogleAnalyticsV2-73385998566956e106b99c5d8ac6b24b.jar
	bin/dexedLibs/universal-image-loader-1.6.3-209cc2b2a86f9907dde46fece0b5873b.jar
	bin/res/drawable-xhdpi/next_active_btn.png
	bin/res/drawable-xhdpi/next_btn.png
	bin/res/drawable-xhdpi/play_active_btn.png
	bin/res/drawable-xhdpi/play_btn.png
	bin/res/drawable-xhdpi/previous_active_btn.png
	bin/res/drawable-xhdpi/previous_btn.png
	bin/res/drawable-xhdpi/seek_thumb.png
	bin/resources.ap_
	gen/com/appota/playota/R.java
commmit