continuous merge of styling
Merge branch 'master' of https://github.com/rhastings-epigeum/EpigeumDev