composer - fixed - added branch alias to dev-master
composer - updated lock file
another travis fix (added composer update after install + no notification on success)
another travis fix (?)
Merge branch 'master' into 1.0

Conflicts:
	.travis.yml
	composer.lock