deleted old files - downloaded new files
Merge branch 'master' of https://github.com/flightllc/flight

Conflicts:
	assets/js/src/approach.js
	assets/js/src/services.js
Merge branch 'master' of https://github.com/flightllc/flight