Merge branch 'paginagmbh'

Conflicts:
	Gemfile
	lib/gemoji_plugin.rb