Javadocs. Completed final query methods.
Added CDI and spring support.