more work on event page, created mixin for names
Merge remote-tracking branch 'origin/master'
add image picker plugin to hallo.js
finishing event page and other tidy up bits from RCA
x-plus work
merge conflicts resolved
mobile is now base (mobile sounded too specific)
move video into carousel
tweaks so that mobile isn't so cramped
merge conflict resolved
more tweaks based on RS feedback
Merge remote-tracking branch 'origin/master'
move event css to modules even though it's not really a reusable module - seems more consistent that way
module for converting format of rich text fields between db, editor and template renderings
font size review
added x-plus functionality to all affected items
Merge branch 'master' of github.com:torchbox/verdant-rca
tweaks to how carousels fire in tabs
converting rich text fields between template, database and editor flavour
Merge branch 'master' of github.com:torchbox/verdant-rca