Merge branch 'master' of https://github.com/Xorg1984/GG

Conflicts:
	cgi-bin/lib/GG/Plugins/Dbi.pm
1