Update composer.json
Merge branch 'dev'

Conflicts:
	bower.json
	composer.json