jre6
Merge branch 'master' into master1
gwt-servlet replaced to older gwt version 2.3.0
Merge branch 'master1'