Merge branch 'latest_comment_issue'
Proper functioning theme, before the redesign (was a fuckup between dev and master branch)
Added DFP module
Merge branch 'add_dfp_module' into develop