Merge pull request #6 from MilkBowl/master

sync
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Update src/net/milkbowl/vault/permission/plugins/Permission_bPermissions2.java

Fix for latest bPermissions refactoring changes.
Merge pull request #338 from codename-B/patch-1

Update src/net/milkbowl/vault/permission/plugins/Permission_bPermissions...
Merge remote-tracking branch 'upstream/master'
fixed problems with last commit for bPerms2 update
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>