correct comment timestamp
fix user course nil in annotation
Merge branch 'development' of github.com:Coursemology/coursemology.org into dev/raymoond_deploy