save research progress
Merge remote-tracking branch 'upstream/development' into research
save research code
Merge branch 'development'
accelerate the process
Merge remote-tracking branch 'upstream/development' into development
Merge branch 'development'
Merge branch 'master' of https://github.com/InformationIntegrationGroup/Web-Karma
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
add timeout function
Merge remote-tracking branch 'upstream/development' into development
format all cleaning code
Merge pull request #52 from areshand/development

Merge Bo's code.
Merge branch 'master' into development