created
Merge origin/master

Conflicts:
	build.xml
	nbproject/project.bak.xml
	nbproject/project.xml
	resources/META-INF/MANIFEST.MF
Merge origin/master
Fixed motor orientation; deleted switch comment