Pick view
Merge this siat
Merge
Merge branch 'master' of github.com:vonsai/ios

Conflicts:
	ios.xcodeproj/project.xcworkspace/xcshareddata/ios.xccheckout
	ios/Api.swift