g
social
Merge branch 'origin/master'

Conflicts:
	.gitignore
	application/views/v_layout.php