Forgot to checkin Tasks from Today.

- Here are the basics for the idea of a madlib in the task creation
  area.  I put them all on seperate lines with 100% width so that we can
  make sure this is how Azmir pictured it going.  Not sure if I was
  reading the document properly.
- I also updated the project structure to contain a base show view and
  show_controller as well as show_template.
Pulled in commits from local task branch.

A local branch I had got ahead of sprint6 on origin, so just pulling in
all my local commits to sprint6 instead of creating a seperate branch on
origin - no need really.