used 24h format
Update DETAILED-SETUP-GUIDE.md

Increase the priority of the new java version from 1 to 2000. In my case, I had installed an other version of java, which had a prio of 1062.
Merge pull request #9 from chrip/patch-1

Update DETAILED-SETUP-GUIDE.md. set java priority up to 2000
JavaDoc added for embedded Graphity
JavaDoc removed
renamed protocol of rest api documentation file
moved test client files
Merge branch 'develop' of github.com:renepickhardt/metalcon into develop
fixed: files missing in JSON generation
Merge branch 'release/graphity'
Merge branch 'master' of github.com:renepickhardt/metalcon
fix install.sh with default template
storage server implemented
Merge branch 'master' of https://github.com/renepickhardt/metalcon into feature/imageServer