Updated README
Added composer.json
Refactoring.
Merge branch 'refs/heads/master' into test

Conflicts:
	README.md
	composer.json
Use doctrine orm as dev dependency
add todo