Merge remote-tracking branch 'origin/master' into rename-spatialcube

Conflicts:
	src/spatialcubeservice/src/main/java/org/vpac/web/controller/TimeSliceController.java
	src/storagemanager/src/org/vpac/ndg/storage/util/TimeSliceUtil.java