migration test
Merge branch 'master' of https://github.com/alexed1/liki

Conflicts:
	server/app/packages/repositories.config