thanhnm 21/10/2014
21/10/2014
Merge remote-tracking branch 'origin/master'

Conflicts:
	Dev/web/app/config/database.php