Adding PHPDoc Blocks to some of the classes (will adventually do them all)
Merge branch 'feature/Forms' into develop