dependency injection second commit
Merge branch 'feature/dependency_injection_second'

Conflicts:
	application/Bootstrap.php