Merge pull request #147 from igemsoftware/master

Master into Branch-chyb
Test and optimize database query response time
Merge remote-tracking branch 'origin/Branch-chyb' into Branch-chyb
Merge pull request #153 from igemsoftware/master

Merge pull request #152 from igemsoftware/Victor
Merge pull request #154 from igemsoftware/LC

Lc
API document updated
Try to solve conflict
Merge pull request #155 from igemsoftware/Branch-chyb

Branch chyb
JRadioButton
Merge pull request #156 from igemsoftware/Victor

Victor
Merge pull request #157 from igemsoftware/master

Victor
Update README.md
Optimize folder structure
Merge remote-tracking branch 'origin/master'
Merge pull request #159 from igemsoftware/master

Master into Victor
Merge remote-tracking branch 'origin/LC'
two kind of resolution
Try to solve conflicts
Merge pull request #162 from igemsoftware/Victor

Victor
Merge branch 'master' of https://github.com/igemsoftware/SJTU-Software_2014