Pita/etherpad-lite — pull request #1097 by johnyma22 (2012-10-29 14:22:48+00:00)
Title: Pull in Develop branch so we can test latest develop

@Pita if you are happy please click "Merge this pull request"