update sam description page
Merge branch 'master' into tom
Merge branch 'master' of https://github.com/puruckertom/ubertool_eco
Merge branch 'jon'