Merge branch 'dev'
created some documentation for the model
added some documentation for the controller form
added some documentation on the view form
Merge branch 'real-docs' into dev
Merge branch 'dev'