update several namespace aliases, fix unicode error fot got-wiki

Change-Id: Icccddefb702500a56a38109d1693bc0563a9685c
ignore *.bak and *.log files

Change-Id: Ic47a48e00dc37baffbdb5d99927f1bfebff65870
Merge changes Ic47a48e0,Icccddefb

* changes:
  ignore *.bak and *.log files
  update several namespace aliases, fix unicode error fot got-wiki