Clean up project root
Merging with trunk, no changes are made to Activity diagram code.
Merging with Trunk, no changes introduced to the State Diagram.
Controller Refactoring