Fixed normal tests
Merge remote-tracking branch 'choose_remote_name/master'
moved controller and refactored gui