Merge branch 'master' into isaac_dev
checkout master; pull
add link back to /item after checkout
merge from master, fix conflicts