testing
Merge branch 'master' into jake
out of here
Merge branch 'master' into jake
changed javascript to make view link work