remove nbproject
Merge branch 'development'