version 1.0.5
Merge branch 'dev' into servlet2
set maven compiler to java 6