is ok
Merge branch 'publish' of github.com:sampanhuang/diana into publish

Conflicts:
	app/Environment.php