* Fix composer json.
Merge branch 'master' of https://github.com/mschurr/framework

Conflicts:
	src/framework/cli.php