improved graylog2-server
Merge remote-tracking branch 'origin/master'

Conflicts:
	SLACKBUILDS.TXT.gz