* Removed dumper
* Removed dumper
Merge remote-tracking branch 'upstream/master'

Conflicts:
	theme_webmail/cgpro/energy.live.cgi