Avatars
fixes
Draggable markers
Merge remote-tracking branch 'origin/master'
Placeholders
Merge remote-tracking branch 'origin/master'

Conflicts:
	travel.iml
Merged