Added some more to CastleRights.java, added 'and' and 'or' functions.
Ran auto-format on several files.
Added "andNot" function to CastleRights.java.