updated composer file
Merge branch 'master' of https://github.com/PithStudio/forrest

Conflicts:
	composer.json