made Makefile win32 ready
change type of mainwindow from GtkWindow to GtkMainWindow
Merge branch 'master' of https://github.com/nichtleiter/EnergieflussGtkCairo

Conflicts:
	ui.glade