changed bigtable to use 0.3.0-SNAPSHOT version to get new alterVisibility code
initial owl import working
Handle immediate revoking of workspaces
Merge branch 'master' into owl-import
upgrade atmosphere to 2.1.1
use the real servlet api
dictionary admin working
sql user repo test with hsqldb
uncomment shankyank dependency
Updated template-resgen-plugin version to 0.11
merge from master
merge origin master
change miniweb version to 0.2.0
change bigtable version to 0.3.0
Merge remote-tracking branch 'origin' into sqlUserAndWrkspace
new version of secure graph
Merge remote-tracking branch 'origin' into sqlUserAndWrkspace
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
move securegraph to own module