drawables
Merge branch 'drawable'

Conflicts:
	thiner-app/AndroidManifest.xml
Merge branch 'drawable'

Conflicts:
	thiner-app/AndroidManifest.xml