detect
Merge branch 'master' of https://github.com/phamxuancan/viralpage

Conflicts:
	app/controllers/detect.php