Fix release 2016 05 10 merge conflicts with master
common ------ This directory contains common code shared between LMS and CMS, such as Mako templates, CSS, and Coffescript.
