added separationRadius variable, intitialised value dependent on
selected difficulty
Merge branch 'master' of https://github.com/CremboC/INI.git
Moved Flightplan generation and WaypointData into separate classes
Merge branch 'master' of https://github.com/CremboC/INI.git

Conflicts:
	ini-atc/src/seprini/controllers/AircraftController.java