EMBRYO-38, EMBRYO-28: added route upload and schedule to map page
EMBRYO-38: route upload working again
EMBRYO-28: scheduling working better
EMBRYO-49: routeedit added
Merge branch 'master' of github.com:dma-dk/Embryo

Conflicts:
	src/main/webapp/css/reporting.css
	src/main/webapp/css/routeupload.css
	src/main/webapp/js/control/reporting.js
	src/main/webapp/js/reporting/route-upload.js
	src/main/webapp/js/reporting/schedule.js
	src/main/webapp/map.html
	src/main/webapp/partials/routeUpload.html
	src/main/webapp/partials/schedule.html
Merge branch 'master' of github.com:dma-dk/Embryo