Upgrade gems

fixes dependencies for compiling assets; fixes security issues
Merge branch 'master' into develop
Massage final doc