Merge branch 'w5mith-master'

Conflicts:
	src/WSAssetPickerController.h
	src/WSAssetPickerController.m
	src/WSAssetPickerState.h
	src/WSAssetTableViewController.m
	src/WSAssetViewColumn.m
Merge branch 'master' of github.com:agassiyzh/WSAssetPickerController

Conflicts:
	src/WSAssetPickerController.m