Merge branch 'master' into attribute_names

* master: (33 commits)
  add french translation from Lucas Manssens
  General bundle update in keeping with #930 and the 1.8.x deprecation. The only restrictions left are for rails and Rubyzip (not sure why). Let's hope Generalissimo Travis approves of this little putsch
  rename variable and use clearer conditional
  fix feed visibility
  display group owned screen in my screens
  fix screen permission (don't show all screens in other section)
  Closes #924. Another Devilish Bug Vanquished.
  submissions#show issue where 'edit content' would block link
  #869 handle no files edits
  #869 support replacing graphic and stylesheet on template edit
  #869 add fields for graphic and stylesheet files
  Bump to 0.9.1.kilobalrog.
  Fixes #923 thanks for the hint @bamnet
  Disable viewport scaling for mobile devices
  changed responsiveness of menu per #521. it's not perfect, but it's a start without going crazy over mobile use
  fixed the attribution of the commit. sorry for being a concerto virgin...
  Revert "added "edit content" and some flashy jquery to actually do it"
  added "edit content" and some flashy jquery to actually do it
  Proper logging for Content Not Found for Frontend
  Closes #891.. Thanks @gabe283 thanks for finding this.
  ...
Merge branch 'attribute_names' of github.com:concerto/concerto into attribute_names

* 'attribute_names' of github.com:concerto/concerto: (33 commits)
  Screen auth test
  Fixed error when submitting params owner id and owner type
  Hardware plugin should be enabled
  Admins should be added to groups they apply to
  Change if to unless, unless that's an if
  New leader field only works for group#new action
  Remove height/width fields from view per #935
  Create a more generalized filterable menu that supports both groups and users
  modified "edit content" banner location revision of ae88200527e9b76a9ee166594eb4afd6c049cc91
  Bumped hardware and iframe plugins
  Plugins gemfile had wrong hardware plugin
  button style
  Added filterable user list to new group leader selection
  Added filterable menu when creating new memberships
  tracking and responsiveness increased letter tracking on buttons and fixed browser width responsiveness to match
  fixed extraneous slash from dbde1072881a52436183a3a731c360b924446c9a
  favicon upgrade: 16x16 --> 64x64
  fix for 1412cf3de795a59d8c0f79640c62c6d20c1df661
  topmenu button styling
  Add padding to template preview graphic
  ...