update
Merge branch 'master' of https://github.com/airshiplay/android

Conflicts:
	android-framework/AndroidManifest.xml
Merge branch 'master' of https://github.com/airshiplay/android
update
Merge branch 'master' of https://github.com/airshiplay/android

Conflicts:
	android-framework/src/com/airshiplay/framework/download/DownloadTask.java
remove
update log ， util ，http client etc
update color
image handler
Signed-off-by: airshiplay <airshiplay@126.com>