2014/8/31 backup
last commit from server
fix conflict