Dummy error
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/GrantController.php
	composer.lock
Drop vendor