Storage modue as of 25/9/2014
Merge branch 'daryl_storage' into controller