Pushing development to version 1.2.0
Adding item to TODO
update TODO
Merge remote-tracking branch 'origin/qa' into develop
Making log file a config parameter
Merge remote-tracking branch 'dean/develop' into develop
Adding functionality to handle config.xml file being installed in etc
update interview tree if user modality modified
give feedback on failed search, don't set active interview to null on close
add file to store help text
update TODO
Tweaking the rating layout
Finished bug fixing in qa branch, calling it version 1.1.1
Merge remote-tracking branch 'origin/qa' into develop

Conflicts:
	TODO
	src/model/Interview.cxx
Fixing minor bug caused by merge from qa
Delete TODO
Merge remote-tracking branch 'patrick/develop' into develop

Conflicts:
	TODO
fix merge conflict
update TODO
WIP: detangling MVC classes in prep for building libraries