intermittent commit #666
Merge branch 'master' into dev-als364
Working on actorController

Actor moves now but to the wrong objects and other issues.
Actors Moving to their Objects

- fixed some bugs to get the actors to move to their objects
- added a method to re-calculate the grids totals (not just when grid is
created)
- The actors move to one spot away from their destination. Not sure how
to handle this.
Completely refactored constructors and updated Canvas
Fixing merge conflicts
Fixing merge conflicts (again)
Merging

Merging with Athena
Added logging

LOG_FRAMES in gameengine is the number of frames between each time the
state is written to the log
fixing merge conflicts