test
Merge branch 'master' of
https://github.com/ICSS-Technikum-Wien/ESS_TOUCHNRFLED

Conflicts:
	capsens_i2c/Debug/application.obj
	capsens_i2c/Debug/application.pp
	capsens_i2c/Debug/capsens_i2c.map
	capsens_i2c/Debug/capsens_i2c.out
	capsens_i2c/Debug/capsens_i2c_linkInfo.xml