Added Binary Block Storage Service
Refactored FileStorage Service and its usage in DefaultController
Merge origin/master