Added composer.json to install the framework
Updated the index file for composer
Merge branch 'develop' into integration/propel

Conflicts:
	composer.json
Updated the composer.json file