Fixed merge typo bug + template html link
Merge branch 'unittesting' into unittesting-demo