Fixed can view permission bug with keys
updated chucho
Merge remote-tracking branch 'refs/remotes/origin/master' into development