Included missing html tempaltes, up version
Merge branch 'develop'