Moved several MainViewController specific variables from ModelState to the MainViewController.
Merge branch 'master' of https://github.com/jahales/BIRD