Yerp
Merge branch 'alpha' of github:Advael/GUFG into alpha

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