Adjusted for retrica 2.0
Merge branch 'master' of https://github.com/tastyone/ELCImagePickerController

Conflicts:
	Classes/ELCImagePicker/ELCAlbumPickerController.h
	Classes/ELCImagePicker/ELCAlbumPickerController.m
	Classes/ELCImagePicker/ELCAssetCell.h
	Classes/ELCImagePicker/ELCAssetCell.m
	Classes/ELCImagePicker/ELCAssetTablePicker.m
	Classes/ELCImagePicker/ELCImagePickerController.h
	Classes/ELCImagePicker/ELCImagePickerController.m