Content now works again
Merge branch 'stultus' of github.com:charlesportwoodii/CiiMS into stultus