Merge remote-tracking branch 'origin/master'

Conflicts:
	res/drawable-ldpi/ic_launcher.png
	res/drawable-mdpi/ic_launcher.png