Merge remote-tracking branch 'origin/master' into LC
Merge branch 'LC' of https://github.com/igemsoftware/SJTU-Software_2014 into LC