update build file
fix some bug and  update some code
Merge branch 'develop201403191112'