style changes
other changes, conflict
Merge branch 'develop' of
https://github.com/redapesolutions/jatomidjango into develop asasss
.
style changes on top nav
add active menu func to membership page, not comp
active menu complete --
overview old --
little bakend stuff on overview page
little bakend stuff on overview page
view being undone here
Merge branch 'user_transactions' of https://github.com/redapesolutions/jatomidjango into user_transactions
adding trassaction page data ( view to  template)