remove NetBeans metadata
Merge origin/master