tmp
Merge branch 'attr' into better-from-xml-to-xml

Conflicts:
	gpxpy/gpxfield.py