Note Controller Update and Beans.XML
Updated Classes
Merging Conflicts
Merge pull request #48 from Caf131/dev-chris

Dev chris