Removed files that should not have been checked in
Merge branch 'develop' into release
Added extra lookups for topic keyword
Changed logging on findWhenController