Fix errors
Merge branch 'master' of https://github.com/nlaplante/syslogng-web.git

Conflicts:
	resources/sysinit/gentoo/init.d/syslogng-web