- fix netbeans css issues
Merge branch 'master' of https://github.com/thenhkid/icsciences

Conflicts:
	nb-configuration.xml