Merge with origin
Merge branch 'feature/resource' of github.com:rymdjs/prototype into feature/resource
Remove redundant rendering calls
Remove unused Keystore
Merge with origin/feature/resource