Merge branch 'fix_facilities'

Conflicts:
	deployment/puppet/horizon/templates/local_settings.py.erb

Signed-off-by: Bogdan Dobrelya <bogdando@mail.ru>