Restore storage directory.
Fix layout.
Merge branch 'feature/missing_dir' into develop
Merge branch 'release/2014071401'