update
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/images/dbimg/12.jpg
Merge remote-tracking branch 'origin/master'
update