fixing the mrg conflict
Merge branch 'goals' of https://github.com/redapesolutions/jatomidjango into goals