2014-4-17-0:04
Merge branch 'master' of https://github.com/ChenXinyue/MSE-Thesis-Doc