Corrected a huge language mistake
Wrote models for CMS and User (no debugging done yet)
Merge branch 'project-hiroshima' of github.com:Freevle/Freevle into project-hiroshima
Debugged cms and wrote tests for it

I have no idea though if the m2m relationship with Group works.