added javaDoc to calcCenterOfMass
Merge remote-tracking branch 'refs/remotes/github/master'

Conflicts:
	colorBasedTracking/src/at/ac/uibk/cs/auis/ColorBasedTracker.java
Merge remote-tracking branch 'refs/remotes/github/master'