addd
Merge branch 'master' of https://github.com/phamxuancan/CinnamonSocialServer

Conflicts:
	app/views/viral/choose_emo.php