added intellij project files to git for github
reformatted html templates and added them to intellij project
Merge remote-tracking branch 'origin/master'