Added some javadoc
Fixed merge conflicts
Merge pull request #82 from buren/AddingSomeJavaDoc

Adding some java doc
Merge branch 'master' of github.com:buren/enduro into techdoc_creation