Merge remote-tracking branch 'origin/master'

Conflicts:
	Dev/web/app/services/QAService.php
Merge remote-tracking branch 'origin/master'
thanhnm 22/10/2014 16:38pm
Merge remote-tracking branch 'origin/master'