ignore project files
deleted net beans folder
Merge branch 'dev'