vendoe 2
Merge branch 'master' of https://github.com/sanjurak/tourismo

Conflicts:
	tourismo/vendor/autoload.php
	tourismo/vendor/composer/autoload_classmap.php
	tourismo/vendor/composer/autoload_real.php
	tourismo/vendor/composer/installed.json