Ngerapi-rapiin
Merge branch 'master' of https://github.com/Libello/MapalaUI_PhotoLibrary

Conflicts:
	application/views/admin_photo_list.php