added javadoc in popUp
Merge branch 'develop' of https://github.com/pitelk/firstrepo into develop