Code-generated expansion of enums
Update MICROM with negative-lookahead regex
Update NM to NANOMETER with regex
Update S to SECOND with neg.lookahead regex
Update MM to MILLIMETER with regex
Update MICROS to MICROSECOND with neg.lookahead regex
Last few manual fixes
Fix ObjectFactory's use of strings
s/CENTIGRADE/CELSIUS/
Merge 'origin/develop' into units-longnames

Conflicts:
	components/insight/SRC/org/openmicroscopy/shoola/agents/measurement/view/MeasurementViewerModel.java
	components/insight/SRC/org/openmicroscopy/shoola/agents/util/EditorUtil.java
	components/tools/OmeroCpp/src/omero/model/ElectricPotentialI.cpp
	components/tools/OmeroCpp/src/omero/model/FrequencyI.cpp
	components/tools/OmeroCpp/src/omero/model/LengthI.cpp
	components/tools/OmeroCpp/src/omero/model/PowerI.cpp
	components/tools/OmeroCpp/src/omero/model/PressureI.cpp
	components/tools/OmeroCpp/src/omero/model/TemperatureI.cpp
	components/tools/OmeroCpp/src/omero/model/TimeI.cpp
Replace DEKA with DECA
Add default task to travis-build
Update insight UnitsLength usages
Make disk usage plugin work minimally against new response.
Remove non alphanummeric characters before parsing id
Made comment area aware of clicks on wiki objects
Fixed typos
add clarifying comment to avoid future LongPair confusion
embedding viewer example
Stylistic fix