Partial revert of ac997453b97fe1ffeabbbe4449ec0ea865ada337 - I don't think
Shad intended to modify the Formo code.
Merge branch 'kohana_3' of github.com:gallery/gallery3 into kohana_3