Added last changed
Merge remote-tracking branch 'origin/master'

Conflicts:
	assets/overlays/android/res/drawable-nodpi/ab_solid_dark_holo.9.png
Problem