populating categories with storage plugin
Merge branch 'develop' of https://github.com/fogbow/fogbow-manager.git
into develop

Conflicts:
	src/main/java/org/fogbowcloud/manager/core/ManagerController.java
	src/test/java/org/fogbowcloud/manager/core/util/DefaultDataTestHelper.java
	src/test/java/org/fogbowcloud/manager/occi/TestGetCompute.java