work as of morning of 26th June for Heroke test
Merge branch 'phase3' of github.com:leftlogic/fullfrontal2013 into phase3