Work Done:
None Really, consider using yesterday's branch

Problems Faced:
TestProductScreenController tests do not work

Work to be Done:
Merge master into this branch, it is quite out of date
Get tests working