Removed Netbean files 2
Merge branch 'development'