Add MainController for Window
Merge branch 'master' of github.com:alexmantel/GKA

Conflicts:
	bin/model_impl/main.class
	src/model_impl/main.java