2nd dev
Merge remote-tracking branch 'origin/master'

Conflicts:
	Joe/Animation/src/com/example/animation/FullscreenActivity.java