small changes
Merge branch 'master' of https://github.com/hanappe/low-energy-boinc

Conflicts:
	quicktester/linux/server/server.c
small changes