fixing template
Merge branch 'master' of https://github.com/yathit/ydn-base
Merge branch 'master' of https://github.com/yathit/ydn-base
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'