Add layout field to FlexForm and use it in Fluid template
Merge branch 'master' of https://github.com/visol/viflickr