Fixed Null Ref Exception in MainForm OnActivated
Removed code that ended up in wrong project
Merge branch 'dev'