continual merge of tomBase into SCSS framework
added var declaration to upd_1_30
Merge branch 'master' of https://github.com/rhastings-epigeum/EpigeumDev

Conflicts:
	css/tomBase.css