Merge branch 'dev' into gabriel

# Conflicts:
#	composer.lock
