Reordering categories and adding version numbers
Merge branch 'develop' of github.com:javaee-samples/javaee-samples.github.io into develop