including like box
Merge branch 'develop' of github.com:redapesolutions/jatomidjango into develop