Edge 2013 12 28

Merged sfu-develop with Instructure's 2013-12-28 tag release