Composer update
Merge branch 'master' of git://github.com/fwahlqvist/WdevPresentation

Conflicts:
	composer.json