Fixed a multitude of issues.
Yerp
Merge branch 'alpha' of github:Advael/GUFG into alpha

Conflicts:
	src/c++/engine/interface.h
Some fixing stuff
Merge remote-tracking branch 'upstream/alpha' into alpha

Conflicts:
	src/c++/engine/interface.cc
	src/c++/engine/interface.h