12-11-14-v1
Merge remote-tracking branch 'origin/master'

Conflicts:
	images/Thumbs.db
	images/photos/Thumbs.db