added galleria gallery
Merge branch 'master' of https://github.com/JuliAne/caravaning

Conflicts:
	css/main.css
	galerie.html
	js/lib/galleria/LICENSE
	js/lib/galleria/galleria-1.2.9.js
	js/lib/galleria/galleria-1.2.9.min.js
	js/lib/galleria/plugins/flickr/flickr-demo.html
	js/lib/galleria/plugins/flickr/flickr-loader.gif
	js/lib/galleria/plugins/flickr/galleria.flickr.js
	js/lib/galleria/plugins/flickr/galleria.flickr.min.js
	js/lib/galleria/plugins/flickr/loader.gif
	js/lib/galleria/plugins/history/galleria.history.js
	js/lib/galleria/plugins/history/galleria.history.min.js
	js/lib/galleria/plugins/history/history-demo.html
	js/lib/galleria/plugins/picasa/galleria.picasa.js
	js/lib/galleria/plugins/picasa/galleria.picasa.min.js
	js/lib/galleria/plugins/picasa/loader.gif
	js/lib/galleria/plugins/picasa/picasa-demo.html
	js/lib/galleria/themes/classic/classic-demo.html
	js/lib/galleria/themes/classic/classic-loader.gif
	js/lib/galleria/themes/classic/classic-map.png
	js/lib/galleria/themes/classic/galleria.classic.css
	js/lib/galleria/themes/classic/galleria.classic.js
	js/lib/galleria/themes/classic/galleria.classic.min.js
	js/main.js