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

Conflicts:

LCPickerViewSample.xcodeproj/project.xcworkspace/xcuserdata/sinss.xcuser
datad/UserInterfaceState.xcuserstate