Version used in Cadiz demo.
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/pt/up/fe/dceg/neptus/mra/NeptusMRA.java
	src/pt/up/fe/dceg/neptus/mra/importers/deltat/DeltaTParser.java