MECA properties
Merge branch 'master' of github.com:maccradar/macc_radar
disabled traffic updates
Merge branch 'master' of github.com:maccradar/macc_radar

Conflicts:
	apps/modum_core/src/link_holon.erl
	apps/modum_core/src/modum_proxy.erl
Merge branch 'master' of github.com:maccradar/macc_radar
Merge branch 'master' of github.com:maccradar/macc_radar
Merge branch 'master' of github.com:maccradar/macc_radar