Correct indentation for initializer lists.
Convert comments from /* to //.
Correct indentation for some template<..> and AddVal. General cleanup.
Merge branch 'rakhimov-google_style' into develop