Added some info for non-resourcefull controllers/forms
Merge remote-tracking branch 'wonko/master'