Merge branch 'master' of https://github.com/mwaterfall/MWPhotoBrowser into mwaterfall-master

Conflicts:
MWPhotoBrowser/Classes/MWPhotoBrowser.m