Updated composer
Merge commit 'b7353a42d4073196c7c238f9aad3f5d062c60871'

Conflicts:
	composer.json
Updated composer
no message
Composer update
Merge branch 'master' of git://github.com/fwahlqvist/WdevPresentation

Conflicts:
	composer.json
Merge branch 'develop' of git://github.com/fwahlqvist/WdevPresentation

Conflicts:
	composer.json