Moved to CSS (asset)
Merge pull request #917 from gauravmittal1995/move_to_css

Moved to CSS (asset)
Incidents have Documents
MCOP: Add these to UI
In Kashmir template-1)added customized page for about and contact 2)Add userguide in the help menu 3)changed the logo
Merge pull request #919 from raoufmir/master

In Kashmir template-1)added customized page for about and contact 2)Add ...
Security: Add support for the UN SLS
Kashmir: Minify
Cleanups for Kashmir
First steps towards new inline forms: rewrite JS as UI widget (thereby
introducing scoping and options), change smurf prefix s3.jquery.ui =>
s3.ui, read rows open on click anywhere, +fix 183.75 bugs along the way
(WIP)
...and remove the old one
First steps towards new inline forms: rewrite JS as UI widget (thereby
introducing scoping and options), change smurf prefix s3.jquery.ui =>
s3.ui, read rows open on click anywhere, +fix 183.75 bugs along the way
(WIP)
MCOP: Allow Polygons for Alerts, modify styling of Alerts layer to handle
Polygons and Points, tweak frontpage copy
Minify
MCOP: Bugfix
Merge branch 'master' of github.com:flavour/eden

Conflicts:
	static/scripts/S3/s3.ui.inlinecomponent.js
Merge branch 'master' of github.com:flavour/eden
Minify
CRMT2: Share Stories tweaks
Allow ability to strip URLFilters, use this for CRMT2 Share Stories
Update Ebola Cases script for new file timestamp :/
Disease: Move out Disease Stats to a dedicated Instance for better
configurability.
GIS: Update GeoExt & GXP
Disease: Complete Aggregations: by Location