installing
Merge branch 'master' of https://github.com/amosmos/scopus

Conflicts:
	composer.lock