merge with latest

added limited editing stuff
changed view to artefact

changed view to artefact
merged changes with latest version

merged changes with latest version
merge changes with upstream

merge all my blog changes to the main stream