Fixed (a) defaults for organization selects, (b) user dashboard nav items
template polishing
fixed conflict
rearranged theme extends
Tidy-up resource dashboard templates
Merge remote-tracking branch 'smanousopoulos/64-geodata-theme' into merge-64