Forms Controller
Added method implementations and tests
Merge remote-tracking branch 'upstream/master'