updated gem lock file
eval before assign for rendering
Merge branch 'development' of github.com:Coursemology/coursemology.org into Deploy