reset, added libs
Merge branch 'master' of https://github.com/Fareroo7/SmartBotApp

Conflicts:
	SensorTest/src/at/simon/sensor/TrilaterationActivity.java