commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/photogallery.js
	photogallery_new.php