added .gitignore
Merge remote-tracking branch 'jonas/development' into development