add drawable mode
add drawable mode ;
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidManifest.xml
add file ;
Merge branch 'master' of https://github.com/wenxiang20130910/Demo_app

Conflicts:
	AndroidManifest.xml