upgrade to v7 and implement general site
Merge branch 'master' of https://github.com/liquidvisual/tr-training