Merge remote-tracking branch 'origin/master'

# Conflicts:
#	bigdata-web/src/main/java/org/diagbot/bigdata/work/ParamsDataProxy.java
#	bigdata-web/src/test/java/org/diagbot/AddStandWordTest.java