will merge in master
Merge branch 'developer'

Conflicts:
	RangeSlider/PLRangeSliderView.m