Squashed 'public/' content from commit e2c5798

git-subtree-dir: public
git-subtree-split: e2c5798f618fd42b017b5adf6250bc20e0b9b7e8
Merge commit '68a1628cc82526fea870622f601a418261e66b2a' as 'public'
rebuilding site Sun 22 Jun 2014 14:19:06 BST