Merge branch 'master' of github.com:JPokemon/jpokemon-lib into generic-manager
Added a contest category for the classic games. Modified the status ailments a little to give more consistent naming.

Signed-off-by: Atheriel <atheriel@gmail.com>
Added a robust gender class.

Signed-off-by: Atheriel <atheriel@gmail.com>
Moved managers and changed inheritance scheme.

Signed-off-by: Atheriel <atheriel@gmail.com>
Added new documentation.

Signed-off-by: Atheriel <atheriel@gmail.com>
Documentation improvements.

Signed-off-by: Atheriel <atheriel@gmail.com>
...

Signed-off-by: Atheriel <atheriel@gmail.com>
Documentation extension javasphinx localized; improved.

Signed-off-by: Atheriel <atheriel@gmail.com>
Added upstream reference to javasphinx clone.

Signed-off-by: Atheriel <atheriel@gmail.com>
Fixed indentation and some typos.

Signed-off-by: Atheriel <atheriel@gmail.com>
Merge branch 'master' into generic-manager
Updated the nature management system. Improved documentation of both classes.

Signed-off-by: Atheriel <atheriel@gmail.com>
Fix typos, fix SimpleNatureManager, and add documentation.

Signed-off-by: Atheriel <atheriel@gmail.com>
Fix merge hell. Probably undid a lot of everyone's work.

Signed-off-by: Atheriel <atheriel@gmail.com>