initial invoices model
Merge branch 'develop' of github.com:redapesolutions/jatomidjango into invoices
Merge branch 'develop' of github.com:redapesolutions/jatomidjango into invoices
Adding invoices to settings
Initial addition of creadhoc user transactions model
Merge branch 'user_transactions' of https://github.com/redapesolutions/jatomidjango into user_transactions
test-fahime
initial topup views and api function
Merge branch 'invoices' into develop
Merge branch 'top_up' into develop
Merge branch 'develop' of github.com:redapesolutions/jatomidjango into develop
Moving api functions out of api.models to api.get and api.post
adding trassaction page data ( view to  template)
api model change
Merge branch 'user_transactions' of github.com:redapesolutions/jatomidjango into user_transactions
Merge branch 'user_transactions' into develop
Merging membership_view and fixing conflicts
Slight organization and optimization of overview view
More changes to membership views / optimization
merge conflict