templates added
added block content to html templates
Merge branch 'master' of https://github.com/kimiaprojects/tutorial1