add sass to settings
Merge branch 'develop' of https://github.com/redapesolutions/jatomidjango into develop
some css and membership page
fixing my git error by addin reamining stuff