handle nil content
Merge branch 'development' of github.com:Coursemology/coursemology.org into Deploy