sss
jjj
Merge branch 'origin/master2'

Conflicts:
	application/views/photos.php