add MD5 in context.xml
resolve conflict
Merge branch 'jdbc' into up