Test commit
Test commit
Fix to trap settings shutdown causing UI test failure

During shutdown, the dynSettings.Controller is set to null

The even to close the SearchView is fired, which causes the view to try and execute a search. As the controller is now null, this causes a crash.

Currently all the UI tests fail due to this. When this is committed, they pass or are inconclusive.
Merge branch 'ChocoButter' of https://github.com/ikeough/Dynamo

Conflicts:
	README.md
Fix addition of unneeded files from version upgrade
Merge pull request #429 from ikeough/ChocoButter

Choco butter
Merge remote-tracking branch 'upstream/master'