Fixed the xls Files
Merge branch 'master' of https://github.com/gauravp94/eden into xsl
Cleanup.
Merge branch 'master' of git://github.com/flavour/eden
Selenium Tests for Creating Event
Fixed the remaining XLS files
Merge pull request #605 from arnavkagrawal/master

Selenium Test for Creating Event
Fixes for case where branches disabled (e.g. SandyRelief). Minify SR CSS
Merge branch 'master' of git://github.com/flavour/eden
Merge branch 'master' of https://github.com/gauravp94/eden into xls
Update Dev toolbar to current Web2Py (fix db stats)
CRMT/DRMP: Disable Org branches. CRMT: Don't include Org's Places in
create forms
Dev Toolbar: Disable response as can cause issues. CRMT: Disable site_id
in Contacts in Org Create form (since we don't yet have any Sites for this
Org), CSS Tweaks
Filter site_id options in organisation contacts inline-component.
GIS Feature Layers have a style_default field to differentiate when
multiple feature layers are defined for the same controller/function.
Fix LocationSelectorWidget2 for hide !important where .show() no longer
overrides
Merge branch 'master' of git://github.com/nursix/eden
Menus for HRM Staff/Volunteers combined, hide FM in IFRC until ready,
consistency in use of Icons/Labels for Action Buttons, add class to
Actions TDs to attempt to max-width them, but no joy yet
Merge branch 'master' of git://github.com/flavour/eden
HRM: Combiend view for Staff/Vols  has Filter/Report options configured.
Advanced Filter button inits MultiSelect/GroupedOpts widgets. HRM
Person.xsl can import Trainings
Merge branch 'master' of git://github.com/flavour/eden