Deleted DS_Strore
nbproject fix
Merge remote-tracking branch 'remotes/origin/Stefan'