Merge origin/master

Conflicts:
	build.xml
	resources/META-INF/MANIFEST.MF
Merge origin/master

Conflicts:
	resources/META-INF/MANIFEST.MF
Merge pull request #4 from jacobbelding/master

Pneumatics Update