merging mid change in templates to fix error in master
removed import of non-existent files from site.less
merge views and css fixes