Merge branch 'develop' into 'master'

Develop



See merge request !1

 测试  2016-10-20
 
-new stat 
\ No newline at end of file
+new stat 
+
+
+
+new branch for cherry pick
+
+18：36
+
+
+
+develop modified
+
+18:50
+
+new time
+
+Br is new update
+br update
+conflict solved
+conflict solved again
+
+
+
+完成br功能，合并到develop
\ No newline at end of file