bump versions
Merge branch 'master' of github.com:leifg/marozi

Conflicts:
	Gemfile.lock