Fixing up makefile
Merge ../../Hydra/Sixense-Java

Conflicts:
	makefile