Merge branches 'dev', 'feature-1.2.6', 'feature-1.2.6,dev' and 'master' of http://192.168.1.220:10080/Amoy/im.doctor into dev