update import gpx module
Revert "update import gpx module"

This reverts commit 680f2206f45802a1f225b5f68014fb2f3a14d594.
Revert "Revert "update import gpx module""

This reverts commit 054e6d1628b65ec195a5b07d01dd34687d58d654.
Merge branch 'requirejs-integration' of https://github.com/NaturalSolutions/ecoReleve-Data into requirejs-integration

Conflicts:
	css/main-style.css
	js/controller.js
	js/layouts/home.js
	js/main.js