Add content for class 2014-05-15
Merge branch '2014-05-15'