Merge pull request #146 from igemsoftware/master

master into Cao
Merge pull request #151 from igemsoftware/master

master into Cao
Merge pull request #157 from igemsoftware/master

Victor
Merge pull request #159 from igemsoftware/master

Master into Victor
Merge pull request #160 from igemsoftware/master

Master into Cao
two kind of resolution
Try to solve conflicts
Merge pull request #162 from igemsoftware/Victor

Victor
Merge pull request #163 from igemsoftware/master

Victor
defore
Merge branch 'master' of https://github.com/igemsoftware/SJTU-Software_2014
Merge pull request #165 from igemsoftware/master

Master into LC
delete some files which are not used
Merge pull request #166 from igemsoftware/Victor

Victor
Merge pull request #167 from igemsoftware/master

Victor
Merge pull request #168 from igemsoftware/Branch-chyb

Branch chyb
Delete BlastIO from folder structure
Merge pull request #169 from igemsoftware/master

Master into Cao
Merge pull request #170 from igemsoftware/master

Master into LC
Merge pull request #171 from igemsoftware/master

Master into LC