Merge pull request #774 from coder006/master

Corrected the CAP xml format by changing the contents of some fields from represent to value
backport nursix' fix for proxy support in edentest
https://github.com/nerdis/edentest/pull/4
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)
Merge pull request #778 from nerdis/master

apply formstyle for login form (bootstrap not supported yet)
Added CRUD strings to budget module
SSF : Homepage changes
typeof: fallbacks for virtual fields
typeof: fix query resolution for reference and list:type fields in lookup table
No-options-available in hierarchicalopts
S3AAA: Complete Auth using formstyle
S3GIS: Progress with screenshot support
Bugfix: HRM profile
Merge pull request #776 from Anurag-Ans/master

Added and Modified few CRUD strings in budget module
Merge pull request #779 from somayjain/ssf-homepage

SSF : Homepage changes
CRMT: Water Tank icon
action ToDo in AuthS3.login, correct various issues with formstyles in auth
S3HierarchyFilter to recognize __typeof queries for population of selected values
Unicode fix
Merge branch 'master' of git://github.com/flavour/eden