update
Merge remote-tracking branch 'origin/master'

Conflicts:
	log/error_log.txt
	module/gallery/gallery.php