Modified tests to handle datetime, bugfix
DRMP: Updated Content & Labels
Map shows throbber whilst loading
Merge pull request #539 from somayjain/newbranch

Modified tests to handle datetime, bugfix
Cleanup web2py.js, minify
Volunteer Service Record aggregates programme hours. Now we're normally on
Py-2.7, use native OrderedDict where-possible
jQueryUI Popups don't show their contents until iframe is resized. Fix Map
Loader when no callback used.
Fix line-endings: csv module doesn't support Mac ones
Merge branch 'master' of git://github.com/flavour/eden