Revert cb60963..394b045

This rolls back to commit cb609639f497c3c41dddf820666dfda03443c330.
rollback to version before 'sb'
Merge branch 'master' of https://github.com/OBipolar/java-CS2340

Conflicts:
	M3/nbproject/private/private.xml