GRIM: Change NULL to nullptr.
GRIM: Add override to overriden functions
Merge pull request #886 from klusark/c++11

Use nullptr and override throughout the code