test
Merge branch 'master' of https://github.com/maccradar/macc_radar

Conflicts:
	apps/modum_core/ebin/ant.beam
	apps/modum_core/ebin/astar.beam
	apps/modum_core/ebin/client.beam
	apps/modum_core/ebin/core_test.beam
	apps/modum_core/ebin/inits.beam
	apps/modum_core/ebin/link_model.beam
	apps/modum_core/ebin/modum_core.app
	apps/modum_core/ebin/node_holon.beam
	apps/modum_core/ebin/parsers.beam
	apps/modum_core/ebin/server.beam
	apps/modum_core/ebin/traffic_ant.beam
	apps/modum_core/ebin/vehicle_holon.beam
	apps/modum_core/src/modum_core.app.src