...
Merge branch 'master' of https://github.com/Texicitys/repository-manager

Conflicts:
	Gemfile.lock