Deleted vendor files, my bootstrap
Removed composer.lock
Merge branch 'master' of ssh://scoutyx.no-ip.biz/home/git/website

Conflicts:
	composer.lock
	my_bootstrap.php
	vendor/autoload.php
	vendor/composer/autoload_real.php
	vendor/composer/installed.json
Calendar is correct visually (week display, event clicking alpha...)
Merge branch 'master' of ssh://scoutyx.no-ip.biz/home/git/website

Conflicts:
	my_bootstrap.php