proper loading
Merge branch 'master' of github.com:dtorres/QBImagePickerController

Conflicts:
	QBImagePickerController/Classes/QBAssetCollectionViewController.m