Refactored Character and object
Refactored Map and MapViewer
Resolving merge conflicts
Resolving further conflicts
Tiny change
Removing Debug printouts
Fixed syntax error.
Changes Uint64 to uint64_t
Merge branch 'master' into notifications