Adding extras to git ignore to avoid committing JRebel
Fix to addAll
Fixes to merge