Funkční
Merge remote-tracking branch 'origin/master'

Conflicts:

	caravans/BackendModule/controls/GalleryManager/GalleryManagerControl.php
	caravans/BackendModule/controls/GalleryManager/gallery.latte
	caravans/config/config.neon
	caravans/model/CaravanImage.php
	caravans/model/CaravanManager.php
	caravans/presenters/CaravanPresenter.php
	caravans/templates/@layout.latte
	caravans/templates/Caravan/showAll.latte
	caravans/templates/Homepage/default.latte
	caravans/templates/header.latte
	www/css/screen.css
	www/images/web/submenu.gif
	www/js/main.js