style changes
other changes, conflict
Merge branch 'develop' of
https://github.com/redapesolutions/jatomidjango into develop asasss
.