fix Change boss form
Merge remote-tracking branch 'origin/master'

Conflicts:
	nbproject/private/private.xml
	src/Boss/BOss.java

Merge remote-tracking branch
'origin/master'

Conflicts:
	nbproject/private/private.xml
	src/Boss/BOss.java
Fix form