Merge branch 'development'
Merge branch 'development'
Merge branch 'master' of https://github.com/InformationIntegrationGroup/Web-Karma
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge pull request #52 from areshand/development

Merge Bo's code.
Merge branch 'master' into development
remove two warnings