update
Merge branch 'master' of https://github.com/iyottt/af

Conflicts:
	app/views/social/index.php