+add netbeans
Merge remote-tracking branch 'origin/master' into developer

Conflicts:
	nbproject/project.xml
+Fix Album Module
Merge remote-tracking branch 'origin/developer'