Merge branch 'master' of github.com:idoo/geodocs

Conflicts:
	Gemfile.lock