Release 2015 06 10 conflict
common ------ This directory contains common code shared between LMS and CMS, such as Mako templates, CSS, and Coffescript.