Indent with spaces to follow PSR-2
Merge branch '2.0'

Conflicts:
	composer.json
	docs/readme.md
	src/fixture/app/config/database.php
	src/fixture/app/config/queue.php
	src/fixture/app/config/session.php
	src/fixture/app/config/view.php