move mimetype to new module
moved clavin to new process
added property key to term mention row key
Merge branch 'master' into storm-property-change

Conflicts:
	lumify-enterprise/lumify-clavin/src/main/java/com/altamiracorp/lumify/clavin/ClavinTermMentionFilter.java
	lumify-enterprise/lumify-enterprise-storm/src/main/java/com/altamiracorp/lumify/storm/term/extraction/TermExtractionBolt.java
	lumify-enterprise/lumify-enterprise-storm/src/test/java/com/altamiracorp/lumify/storm/term/resolution/ClavinLocationResolutionWorkerTest.java
	lumify-public/lumify-core/src/test/java/com/altamiracorp/lumify/core/EntityHighlighterTest.java
	lumify-public/lumify-storm/src/main/java/com/altamiracorp/lumify/storm/BaseLumifyBolt.java
	lumify-public/lumify-web/src/main/java/com/altamiracorp/lumify/web/routes/graph/GraphVertexUploadImage.java
merge from master
Merge branch 'master' into storm-property-change

Conflicts:
	lumify-enterprise/lumify-analytics/pom.xml
	lumify-enterprise/lumify-enterprise-storm/src/main/java/com/altamiracorp/lumify/storm/video/VideoContentTypeSorter.java
	lumify-enterprise/lumify-enterprise-storm/src/test/java/com/altamiracorp/lumify/storm/video/VideoContentTypeSorterTest.java
	lumify-public/lumify-core/src/main/java/com/altamiracorp/lumify/core/bootstrap/LumifyBootstrap.java
	lumify-public/lumify-core/src/main/java/com/altamiracorp/lumify/core/model/properties/LumifyProperty.java
	lumify-public/lumify-web/src/main/java/com/altamiracorp/lumify/web/routes/entity/ResolveTermEntity.java
	lumify-public/lumify-web/src/main/java/com/altamiracorp/lumify/web/routes/graph/GraphVertexUploadImage.java
moved property types to own package
Merge branch 'master' into storm-property-change

Conflicts:
	lumify-enterprise/lumify-enterprise-storm/src/main/java/com/altamiracorp/lumify/storm/video/VideoPreviewBolt.java
	lumify-public/lumify-core/src/main/java/com/altamiracorp/lumify/core/model/properties/MediaLumifyProperties.java
	lumify-public/lumify-web/src/main/java/com/altamiracorp/lumify/web/routes/artifact/ArtifactRaw.java
	lumify-public/lumify-web/src/main/java/com/altamiracorp/lumify/web/routes/graph/GraphVertexUploadImage.java