clean up names
Merge branch 'master' of https://github.com/designxtek/typescript-marionette

Conflicts:
	site/scripts/layouts/aboutlayout.ts