Merging changes for hotfix/2015-10-05
common ------ This directory contains common code shared between LMS and CMS, such as Mako templates, CSS, and Coffescript.