Socket usage graphs on view outlet page
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	webappserver/src/main/java/com/cerberus/module/usage/workflows/UsageWorkflow.java
	webappserver/src/main/java/com/cerberus/service/usage/ConsumptionService.java
	webappserver/src/main/resources/hibernate.cfg.xml
Merge remote-tracking branch 'origin/develop' into develop