Added a new matcher to count child elements.
Cleanup to remove aapt warnings about duplicate dependencies on apache components
General cleanup around Java code