Various
Merge branch 'master' of https://github.com/xowor/UniSO

Conflicts:
	src/auctioneer.c
fixed alarm bug