Merge origin/master

Conflicts:
	NetBeansClase/src/netbeansclase/Main.java