changes on instruments

changes on instruments
Merge branch 'master' of https://github.com/BSSAM/bs

Conflicts:
	nbproject/private/private.xml