commit
Merge branch 'master' of https://github.com/sinss/LCPickerView

Conflicts:
	LCPickerViewSample/classes/LCTableViewPickerControl.h
	LCPickerViewSample/classes/LCTableViewPickerControl.m