songview
songview
temp
Merge branch 'master' of https://github.com/hqt/HopAmChuan
parse data from network
parse data from network
Merge branch 'master' of https://github.com/hqt/HopAmChuan

Conflicts:
	Hop Am Chuan/Hop Am Chuan/build/apk/Hop Am Chuan-debug-unaligned.apk
	Hop Am Chuan/Hop Am Chuan/build/classes/debug/com/hqt/hac/helper/adapter/ChordViewAdapter.class
	Hop Am Chuan/Hop Am Chuan/build/classes/debug/com/hqt/hac/helper/adapter/ChordViewImageAdapter.class
	Hop Am Chuan/Hop Am Chuan/build/classes/debug/com/hqt/hac/helper/adapter/ChordViewTextureAdapter.class
	Hop Am Chuan/Hop Am Chuan/build/classes/debug/com/hqt/hac/helper/adapter/FavoriteManagerAdapter.class
	Hop Am Chuan/Hop Am Chuan/build/classes/debug/com/hqt/hac/helper/adapter/FindByChordAdapter.class
	Hop Am Chuan/Hop Am Chuan/build/classes/debug/com/hqt/hac/helper/adapter/NavigationDrawerAdapter$HeaderAdapter.class
	Hop Am Chuan/Hop Am Chuan/build/classes/debug/com/hqt/hac/helper/adapter/NavigationDrawerAdapter$ItemAdapter.class
	Hop Am Chuan/Hop Am Chuan/build/classes/debug/com/hqt/hac/helper/adapter/NavigationDrawerAdapter$PlaylistHeaderAdapter.class
	Hop Am Chuan/Hop Am Chuan/build/classes/debug/com/hqt/hac/helper/adapter/NavigationDrawerAdapter$PlaylistItemAdapter.class
	Hop Am Chuan/Hop Am Chuan/build/classes/debug/com/hqt/hac/helper/adapter/NavigationDrawerAdapterDraft.class
	Hop Am Chuan/Hop Am Chuan/build/classes/debug/com/hqt/hac/helper/adapter/PlaylistDetailAdapter.class
	Hop Am Chuan/Hop Am Chuan/build/classes/debug/com/hqt/hac/helper/adapter/PlaylistManagerAdapter.class
	Hop Am Chuan/Hop Am Chuan/build/classes/debug/com/hqt/hac/helper/widget/BackgroundContainer.class
	Hop Am Chuan/Hop Am Chuan/build/classes/debug/com/hqt/hac/view/MainActivity$1.class
	Hop Am Chuan/Hop Am Chuan/build/classes/debug/com/hqt/hac/view/MainActivity.class
	Hop Am Chuan/Hop Am Chuan/build/classes/debug/com/hqt/hac/view/R$drawable.class
	Hop Am Chuan/Hop Am Chuan/build/classes/debug/com/hqt/hac/view/R$id.class
	Hop Am Chuan/Hop Am Chuan/build/classes/debug/com/hqt/hac/view/R$integer.class
	Hop Am Chuan/Hop Am Chuan/build/classes/debug/com/hqt/hac/view/R$layout.class
	Hop Am Chuan/Hop Am Chuan/build/classes/debug/com/hqt/hac/view/R$menu.class
	Hop Am Chuan/Hop Am Chuan/build/classes/debug/com/hqt/hac/view/R$raw.class
	Hop Am Chuan/Hop Am Chuan/build/classes/debug/com/hqt/hac/view/R$string.class
	Hop Am Chuan/Hop Am Chuan/build/classes/debug/com/hqt/hac/view/R$style.class
	Hop Am Chuan/Hop Am Chuan/build/classes/debug/com/hqt/hac/view/R$styleable.class
	Hop Am Chuan/Hop Am Chuan/build/classes/debug/com/hqt/hac/view/R$xml.class
	Hop Am Chuan/Hop Am Chuan/build/classes/debug/com/hqt/hac/view/R.class
	Hop Am Chuan/Hop Am Chuan/build/classes/debug/com/hqt/hac/view/fragment/NavigationDrawerFragment.class
	Hop Am Chuan/Hop Am Chuan/build/classes/debug/com/hqt/hac/view/fragment/WelcomeFragment.class
	Hop Am Chuan/Hop Am Chuan/build/classes/debug/com/hqt/hac/view/test/MainActivityNavigationDrawer.class
	Hop Am Chuan/Hop Am Chuan/build/classes/debug/com/hqt/hac/view/test/MainActivityTest.class
	Hop Am Chuan/Hop Am Chuan/build/classes/debug/com/hqt/hac/view/test/TestActivity$PlaceholderFragment.class
	Hop Am Chuan/Hop Am Chuan/build/classes/debug/com/hqt/hac/view/test/TestDatabaseActivity.class
	Hop Am Chuan/Hop Am Chuan/build/classes/debug/com/hqt/hac/view/test/TestParser.class
	Hop Am Chuan/Hop Am Chuan/build/classes/debug/com/hqt/hac/view/test/TestSurfaceView.class
	Hop Am Chuan/Hop Am Chuan/build/classes/debug/com/hqt/hac/view/test/TestTextView$PlaceholderFragment.class
	Hop Am Chuan/Hop Am Chuan/build/classes/debug/com/hqt/hac/view/test/TestTextView.class
	Hop Am Chuan/Hop Am Chuan/build/classes/debug/com/jeremyfeinstein/slidingmenu/lib/R$id.class
	Hop Am Chuan/Hop Am Chuan/build/exploded-bundles/HopAmChuanHopAmChuanLibsSlidingMenuUnspecified.aar/classes.jar
	Hop Am Chuan/Hop Am Chuan/build/incremental/dex/debug/inputs.data
	Hop Am Chuan/Hop Am Chuan/build/incremental/mergeAssets/debug/merger.xml
	Hop Am Chuan/Hop Am Chuan/build/incremental/mergeResources/debug/inputs.data
	Hop Am Chuan/Hop Am Chuan/build/incremental/mergeResources/debug/merger.xml
	Hop Am Chuan/Hop Am Chuan/build/incremental/mergeResources/debug/outputs.data
	Hop Am Chuan/Hop Am Chuan/build/libs/Hop Am Chuan-debug.ap_
	Hop Am Chuan/Hop Am Chuan/build/libs/Hop Am Chuan-debug.dex
	Hop Am Chuan/Hop Am Chuan/build/manifests/debug/AndroidManifest.xml
	Hop Am Chuan/Hop Am Chuan/build/res/all/debug/values-v11/values.xml
	Hop Am Chuan/Hop Am Chuan/build/res/all/debug/values/values.xml
	Hop Am Chuan/Hop Am Chuan/build/res/all/debug/xml/searchable.xml
	Hop Am Chuan/Hop Am Chuan/build/source/r/debug/com/hqt/hac/view/R.java
	Hop Am Chuan/Hop Am Chuan/build/source/r/debug/com/jeremyfeinstein/slidingmenu/lib/R.java
	Hop Am Chuan/Hop Am Chuan/build/symbols/debug/R.txt
	Hop Am Chuan/Hop Am Chuan/libs/SlidingMenu/build/bundles/debug/classes.jar
	Hop Am Chuan/Hop Am Chuan/libs/SlidingMenu/build/bundles/release/classes.jar
	Hop Am Chuan/Hop Am Chuan/libs/SlidingMenu/build/incremental/mergeResources/debug/outputs.data
	Hop Am Chuan/Hop Am Chuan/libs/SlidingMenu/build/incremental/mergeResources/release/outputs.data
	Hop Am Chuan/Hop Am Chuan/libs/SlidingMenu/build/incremental/packageResources/debug/outputs.data
	Hop Am Chuan/Hop Am Chuan/libs/SlidingMenu/build/incremental/packageResources/release/outputs.data
	Hop Am Chuan/Hop Am Chuan/libs/SlidingMenu/build/libs/SlidingMenu-debug.aar
	Hop Am Chuan/Hop Am Chuan/libs/SlidingMenu/build/libs/SlidingMenu-debug.ap_
	Hop Am Chuan/Hop Am Chuan/libs/SlidingMenu/build/libs/SlidingMenu-release.ap_
	Hop Am Chuan/Hop Am Chuan/libs/SlidingMenu/build/libs/SlidingMenu.aar
	Hop Am Chuan/Hop Am Chuan/src/main/AndroidManifest.xml
	Hop Am Chuan/Hop Am Chuan/src/main/res/values/styles.xml
merge conflict