Changed the time format to match with CAP standards and removed timezone
and unnecessary imports

Changed the time format to match with CAP standards and removed the time zone

Removed old imports
Bugfix: restore missing setting, cleanup en-gb, start work on Map
screenshots
Merge pull request #777 from nerdis/master

backport nursix' fix for proxy support in edentest
Merge pull request #775 from coder006/master

Changed the time format to match with CAP standards and removed the timezone
apply formstyle for login form (bootstrap not supported yet)