Merge branch 'isaac_dev'
minor
minor gitignore
Merge branch 'isaac_dev'
contrib libraries are deprecated. use java.io
merge from master, fix conflicts