Merge pull request #26 from Orasi/staging

view refix
remove delete buttons for non-admins
Merge branch 'staging'
Merge branch 'master' of github.com:Orasi/onTap
put in john doll protection
test fixes