delete some resource and source ;
Merge branch 'master' of https://github.com/wenxiang20130910/Demo_app

Conflicts:
	AndroidManifest.xml
	src/com/example/demo_app/MainActivity.java
	src/com/example/demo_app/actionbar/ActionBarActivity.java
	src/com/example/demo_app/canvas/MyCanvasActivity.java
	src/com/example/demo_app/drawable/DrawableActivity.java
	src/com/example/demo_app/gridview/MyGridViewActivity.java
	src/com/example/demo_app/matrix/MatrixActivity.java
	src/com/example/demo_app/view/ViewActivity.java