Merge branch 'development' of https://github.com/usc-isi-i2/Web-Karma into development
minor code refactoring
Merge branch 'development' of https://github.com/usc-isi-i2/Web-Karma into development
Merge pull request #145 from saggu/development

Development