no message
Merge branch 'master' of https://github.com/stephenzl/IDMPhotoBrowser

Conflicts:
	Classes/IDMPhotoBrowser.h