updated gitignore, updated karma conf
reverted karma conf
Merge branch 'develop'