Typo cmposer.json
Merge branch 'master' of ssh://github.com/zapoyok/TimelineJsBundle

Conflicts:
	composer.json