removed few warnings
Merge branch 'remove_warnings' into c++11
NULL to nullptr
add override