Update
Merge branch 'master' of https://github.com/isflorin/artmediaone

Conflicts:
	composer.lock
update