Fix bad js
Merge pull request #90 from calblueprint/fix-bad-js

Fix bad js
merging master to get js fixes
Merge branch 'master' into addimagetoshow
removed image if not there