fixes
Merge branch 'master' of https://github.com/jomsocialTest/JomsocialAutomationTest

Conflicts:
	test/progressive/3.2/admin/verifyAccessJomsocialComponent.php