bugfix
Merge remote-tracking branch 'origin/master'

Conflicts:
	lesson10(BitmapAllocation)/lesson10(BitmapAllocation).iml
	lesson11(PictureViewer)/lesson11(PictureViewer).iml
	lesson12(LayoutTransition)/lesson12(LayoutTransition).iml
	lesson12(LayoutTransition)/src/com/squark23/lesson12/LayoutTransChanging.java