Fixing photo count
Fixing photo count

Conflicts:
	code/PhotoAlbum.php
	code/PhotoGallery.php
	code/PhotoItem.php