Bug fix fast_select: secondary queries need all joins from dfields; filter sector filter for project time report
Bug fix fast_select: don't include vfltr fields in extract; Fix missing import in s3utils.py
Merge branch 'master' of git://github.com/flavour/eden
Make MembershipVirtualFields lazy
DRMP tweaks (inc partial merge Michael), Update Flot to v0.8
sync_conflict table deprecated
pr default list_fields & represent for NONE
Make grouped opts widget fit for crud forms, migrate ProjectDRRModel
Fix dt orderby.
Merge branch 'master' of git://github.com/flavour/eden
Bug fixes.
Revert broken change to MultiSelect Widget, DRMP layout tweak
responsive design on search filter
changes to index.html and homepage.css to fix homepage layout
start of styling for resources & projects pages
projects and resources table and form styling
moved responsive stylign for filter input and dropdowns to updates.css & cleaned up the styling on the projects and resources /read
added bootstrap button styling to the table open,edit and delete btns and reduced their size
rebase: added bostratp styling to table open, edit, delte. moved styleing for filter and dropdowns to update.css
Merge branch 'master' of https://github.com/catalpainternational/eden