commit contact 2014-5-5
2014-5-5 merge