daily 2014-06-17
Merge branch 'master' of https://github.com/Qingshuai-Tian/MyRepo