update
Merge remote-tracking branch 'origin/master'

Conflicts:
	gallery/phpCAS.log
Merge remote-tracking branch 'origin/master'

Conflicts:
	gallery/phpCAS.log