Merge branch 'uiUpdates' into 'master'

Gemfile.lock

README.md

public/css/jquery.mCustomScrollbar.min.css

public/css/kiosk.css

public/css/resource_scheduler.css

public/css/spencers.css

public/images/time-arrow.svg

public/js/functions.js

public/js/jquery.mCustomScrollbar.js

public/js/jquery.mousewheel.min.js

src/less/resource_scheduler.less

views/calendar.erb

views/fixed.erb

views/reserve.erb

views/resource_calendar.erb