update
Merge branch 'master' of github.com:seleneapp/stage

Conflicts:
	app/bootstrap/autoload.php
	app/bootstrap/env.php
	composer.json
	public/.htaccess
	selene