correct home;
Merge branch 'master' of /home/pasha/netcracker/nclodger1611 with conflicts.
Merge remote-tracking branch 'origin/master'