basic pass
Merge branch 'paste_bitmap' of https://github.com/aaronsh/ColorFiller into paste_bitmap

Conflicts:
	res/drawable/part22_most.png
	res/drawable/part8_most.png
	res/layout/fragment_main_dummy.xml
	res/raw/shapes.json
	src/com/android/widget/ext/ExtImageButton.java