Upgrade elfinder
Merge branch 'master' of github.com:EESoc/eesoc-website

Conflicts:
	app/config/app.php
	app/routes.php
	composer.json
	composer.lock