Update
Merge branch 'master' of https://github.com/all2aller/flickr-grid-photoset-wordpress-plugin

Conflicts:
	README.md