sync photo
Merge remote-tracking branch 'origin/master'

Conflicts:
	static/common/common.js
Merge remote-tracking branch 'origin/master'
sync photo