Update .gitignore
Fix jasmine declarations to not use deprecated bool
Merge remote-tracking branch 'origin/dev-erik'