Category holder class now named singular, final field
org.json library support (android without additional dependencies) + few tests and fixtures from documentation