Again no change
Merge remote-tracking branch 'origin/master'

Conflicts:
	TabsWithSwipeGesture/bin/resources.ap_