fix version_compare
Removing evil if from nginx vhosts

Signed-off-by: Roman Schmerold <bnoize@froxlor.org>
Removed another evil if I overlooked

Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
Fixed duplicate creation of directory protection, fixes #1450

Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
Update copyright in standard customer index

Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
Added froxlor logo to footer

Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
Rewrite of merging special vhost settings, fixes #1430

Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
Merge remote-tracking branch 'upstream/master'