Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	Dev/web/app/services/ActivityService.php
16/10 TuanPA