Merge remote-tracking branch 'origin/master'

Conflicts:
	app/config/mail.php
	app/routes.php
	composer.lock
Remove vendor folder.