Merge remote-tracking branch 'origin/master'

Conflicts:
	res/drawable-hdpi/jungle_frame.jpg