some changes
Merge branch 'develop' of https://github.com/redapesolutions/jatomidjango into develop