sync
Merge branch 'master' of https://github.com/renebentes/plg_content_gallery

Conflicts:
	.gitignore
	README.md
	assets/js/gallery.js
	gallery.php
	gallery.xml
	tmpl/default.php