Adding accounts app
Merge conflicts?
Merge branch 'develop' of github.com:redapesolutions/jatomidjango into develop