views littl changes
merg conflict
view merg conflict
new stylishit folders for templates
some left styles to add newly
settings page styles bak
Merge branch 'css_files_differentiation' into develop
Merge branch 'css_files_differentiation' into develop
Removing duplicate stylesheets
Merge branch 'develop' of github.com:redapesolutions/jatomidjango into develop