add facebook
Merge branch 'master' of https://github.com/curcuroyong/gembels

Conflicts:
	protected/views/profile/index.php