Merge release to master for 2016-05-17 release
Sass Watch: sass --watch lms/static/sass:lms/static/sass -r ./lms/static/sass/bourbon/lib/bourbon.rb