Merge branch 'master' into develop
add build-date in version
fixed HTML Generator bug and rebuild
Merge branch 'develop'