set version to 0.6
Merge branch 'dev' into servlet2