various changes
Merge branch 'master' of https://github.com/paxelito/SENSOR

Conflicts:
	.gitignore
Several bug fixing