Changed coordinates in activate() method to be computer-like (starting
with 0)
Merge remote-tracking branch 'origin/businesslogic' into ui