Cmake config is changed to simplify solution view in visual studio.
Merged branches.