javadoc modified
Merge branch 'master' of https://github.com/cioboteacristian/SDM_project
Merge branch 'master' of https://github.com/cioboteacristian/SDM_project