added java doc
merge other mudeles: Forms and Entities