pull changes from master to dev on 2014-08-24

This update brings these approved pulls to the dev branch:
 * User-visible:
   * #1240: fixed a bug in which the "add/edit chat" button was no longer visible where it should have been

Database updates: none

Once this pull is merged, i will load the changes on dev.buttonweavers.com as part of #217.