Merge branch 'master' of github.com:yahor/hspace into gems_cleanup

Conflicts:
	Gemfile
	Gemfile.lock