Merge remote-tracking branch 'origin/master'

Conflicts:
	GroupProjectSource/APS/test/test/za/ac/wits/elen7045/group3/login/tests/testUserLogin.java