Merge remote-tracking branch 'origin/Adjoa' into michael-branch

Conflicts:
	nbproject/private/private.properties
	nbproject/private/private.xml
	src/v/i/p_software/VIP_SOFTWARE.java