CAP export: select resources per info
Merge branch 'master' of git://github.com/flavour/eden
Enable chat Field and Single sign on
GIS: Radius added to core gis_location
CAP Import/Export fixes & moving processing into XLST
Merge pull request #813 from somayjain/master

CAP : Adding subscription page and search filters to the cap_alert
Merge pull request #812 from arnavkagrawal/master

Enable chat Field and Single sign on
HRM: add missing entries to defaults to make it less mandatory
Skeleton template to make creating a new template easier
Prepop: Move Demo/Train/Test folders inside their Templates. Separate
Users out to a separate prepop option.
UVG: Remove redundant duplicate data.
Restore missing views
Adapt unit test to DAL change, fix typo
MCOP
* Minor Modifications & Style Changes
* Fix Org Profile Page

LACRMT
* Label & Style Changes

General
* Move delete record button to bottom of the update form (safer)
* Removing unnecessary DIVs (Fixes Styling & optimizes pages)

Bootstrap
* use_button_glyphicons controls datatable buttons
* Align style of datatable delete with form delete
* Make cancel botton more prominent
* Make s3_add_resource_link & .action-lnk easier to see (I think that this could be a more generic change - but let's check it out first)

NOTE: Customizations in question in the outdated diff in the Conversation TAB here: https://github.com/flavour/eden/pull/798 have been reverted
* Adding hazard, theme, countries to the deployments form
* Added contributor role
* Deployments, members overlay on the map
* Inline login form
* Adding Sunflower, member map marker icons
* Adding all languages defined in the template in the main menu
Fix, Cleanup, Minify
CRUD: List Button should just show components
NYC: Menu Tweak
Merge pull request #795 from somayjain/ssf-homepage

SSF : Overlays on the map; project_project controller changes
Fix HRM Job Title when Vol disabled
Cleanup, Minify
Fix thousand-formatter method in pivot table reports
S3Forms: Don't show colon for empty labels
CRMT: Tweaks
Merge branch 'master' of git://github.com/nursix/eden
Minify
Fixes for broken chart explore
Update/fix OpenWeatherMap, minify