Added javaDoc and other documenation to various permission related files
Resolve merge conflicts