Updated: NetBeans Project Detail
Merge branch 'master' of https://github.com/morenite/melody

Conflicts:
	nbproject/project.xml