corrected version
Merge branch 'dev' into servlet2