add fancy qr code dialog
display MarketDepthDetail and klineDetailView
Merge branch 'feature/fancy_qr_code' of https://github.com/bither/bither-android into feature/fancy_qr_code
edit fancy qr code
Merge branch 'feature/fancy_qr_code' of https://github.com/bither/bither-android into feature/fancy_qr_code
edit fancy qr code
add fadeout of detailView
Merge branch 'develop' of https://github.com/bither/bither-android into feature/fancy_qr_code
Merge branch 'feature/fancy_qr_code' of https://github.com/bither/bither-android into feature/fancy_qr_code
add native of jpeg
add set avatar dialog
Merge branches 'feature/fancy_qr_code' and 'feature/fancy_qr_code' of https://github.com/bither/bither-android into feature/fancy_qr_code
12 ->14
Merge branch 'feature/fancy_qr_code' of https://github.com/bither/bither-android into feature/fancy_qr_code
add update avatar
Merge branch 'feature/fancy_qr_code' of https://github.com/bither/bither-android into feature/fancy_qr_code
edit save qr code
add cropImageActivity
edit fancy qr code
Merge branch 'feature/fancy_qr_code' of https://github.com/bither/bither-android into feature/fancy_qr_code

Conflicts:
	bither-android/res/values-zh-rTW/strings.xml
	bither-android/res/values-zh/strings.xml
	bither-android/res/values/strings.xml
	bither-android/src/net/bither/fragment/hot/OptionHotFragment.java