friends can comment album and fix video naming
Merge branch 'master' of https://github.com/jomsocialTest/JomsocialAutomationTest

Conflicts:
	phpunit.xml