Finished removing singleton designs.
Merge branch 'master' of https://github.com/jahales/BIRD

Conflicts:
	src/controllers/MainViewController.java