EaTea/CITS4230-Project-Group-7 — pull request #42 by EaTea (2011-10-30 06:49:10+00:00)
Title: Merge working code from views

All this stuff should be working. The stuff after it in views will be broken, see the commit message and commit from 5af16efe1ee657c79b9ecba794e1af48d08b400e for an explanation, and GH-41 for more information on the problem.