Merge pull request #1 from dprandzioch/master

merge bugfix asset inclusion
Merge pull request #2 from dprandzioch/master

added html_safe to title in views
Merge pull request #3 from dprandzioch/master

html escaping bugfix
disqus integrated, own config file created
Merge pull request #4 from dprandzioch/feature-disqus

disqus integrated, own config file created
Merge pull request #5 from dprandzioch/develop

merge from develop