Merge origin/master

Conflicts:
	src/nbodybarneshut/NBodyBarnesHut.java
	src/nbodybarneshut/QuadTree.java
Merge origin/master