2014_2_23 First merge

Merge projects from Tianxin and Xinyuan