resolve conflicts
Merge branch 'master' of https://github.com/xkommando/WebFace
nav settled