cropping contact photo on output
Merge remote-tracking branch 'remotes/upstream/dev'

Conflicts:
	localization/de_DE.inc
	localization/en_US.inc
	localization/fr_FR.inc
	skins/larry/carddav.css
Merge remote-tracking branch 'remotes/skrat/photocrop'
Merge branch 'master' of github.com:mstilkerich/rcmcarddav

Conflicts:
	localization/de_DE.inc