Merge pull request #339 from mung3r/master

bPerms2 fixup
Fixed annoying compiler warnings from javadocs (For IDE's that warn about javadoc errors and missing content)

Signed-off-by: coaster3000 <ckrier.3000@gmail.com>
Merge pull request #340 from coaster3000/master

Fixed Compiler Warnings
Merge pull request #7 from MilkBowl/master

sync