correction
Merge branch 'master' of https://github.com/jdesachy/TRUNK

Conflicts:
	outdoor/src/main/webapp/gpxView.xhtml
Evolution Gps