Updating story boards
Merge remote-tracking branch 'ddx/master'
Fixed image editing stuff