Update to Java 7
Merge branch 'interfacesRefactoring' of
https://github.com/openworm/org.geppetto.solver.sph into
interfacesRefactoring

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
# 
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
default CPU - commented out line on test that fails on CPU on OSX
first try at manually allocating memory
got allocation to work
try new javacl wrapping with timing
Merge branch 'clMemAllocHost' of https://github.com/openworm/org.geppetto.solver.sph into clMemAllocHost

Conflicts:
	src/main/java/com/nativelibs4java/opencl/PublicWrappers.java
	src/main/java/org/geppetto/solver/sph/SPHSolverService.java