Act
Merge branch 'master' of https://github.com/ManeRs11/SBR

Conflicts:
	nbproject/private/private.xml

	deleted:    nbproject/private/private.xml