backport bugfixes from current master

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
add 0.9.31.1 to updater of 0.9.32-dev

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
Fixed missing template vars

Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
Merge branch 'master' of github.com:Froxlor/Froxlor
Added title-tags to buttons, fixes 1328

Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
Added cron for mailtraffic (with EleRas), fixes #69

Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
Fixed mailtraffic not using lastrun time

Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
Fixed a bug which prevented mailtraffic from being shown

Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
Fixes various traffic graph issues

Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
Fixing mailtraffic cron, fixes traffic graph sorting

Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
don't show 'nice' error if no  is specified and disguise passwords of sql-accounts, fixes #1336

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
Merge remote-tracking branch 'origin/0.9.31.1'
damn automatic merge...stupid thing

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
Merge remote-tracking branch 'upstream/master' into mpm_itk