Created Controller to replace StateMap
Adapted Controller to new Model
Replaced StateMap with Controller in View
Merge branch 'master' of https://github.com/Blackhole16/Oberien.git