Merge remote-tracking branch 'origin/master' into KW2012

Conflicts:
	LS2014.c
	LS2014.h
	LS2014_Hardware.h
	Makefile
	Si4705.c
	Si4705.h
	build/default/production/LS2014.o
	build/default/production/LS2014.o.d
	build/default/production/Si4705.o
	build/default/production/Si4705.o.d
	config.h
	dist/default/production/LS2014.production.cof
	dist/default/production/LS2014.production.hex
	nbproject/Makefile-default.mk
	nbproject/Makefile-genesis.properties
	nbproject/Makefile-impl.mk
	nbproject/Makefile-local-default.mk
	nbproject/Makefile-variables.mk
	nbproject/Package-default.bash
	nbproject/configurations.xml
	nbproject/private/configurations.xml
	nbproject/project.xml
Merge branch 'KW2012' of https://github.com/NeuralSpaz/LinzerSchnitte- into KW2012