dictionary admin working
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
add an admin index