Merge branch 'master' of github.com:gregoryklein/GKPhotoBrowser

Conflicts:
	GKPhotoBrowser/GKPhotoBrowser.m
Merge branch 'master' of github.com:gregoryklein/GKPhotoBrowser