Loggning påbörjad
Merge branch 'kandidatarbete' of github.com:Rovanion/AinAppen into kandidatarbete

Conflicts:
	src/gov/polisen/ainappen/DeviceStatusUpdater.java
	src/gov/polisen/ainappen/GlobalData.java
	src/gov/polisen/ainappen/kandidat/NewAlgorithm.java
	src/gov/polisen/ainappen/kandidat/PuppetMaster.java
Efter merge fix
Position bug fixed
I don't even know anymore
Merge branch 'kandidatarbete-win' of https://github.com/henninghall/AinAppen into kandidatarbete

Conflicts:
	src/gov/polisen/ainappen/GlobalData.java
	src/gov/polisen/ainappen/kandidat/Algorithm.java
	src/gov/polisen/ainappen/kandidat/EnergySavingPolicy.java