Merge branch 'community'

diff --cc Makefile.am
index 2fdbd9abae2bf5f6e08f09d0feac1b32f15df992,be16ecf8274d46eee26c323568efbc1c4929bb2b..fcbfd0d77bf0134ea9dfd94c39fe3ad5369e0cf9
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -264,9 -257,17 +264,8 @@@ templates_people_modules_DATA = 
  
  templates_people_modulesdir = $(templates_peopledir)/modules
  
 -templates_people_ssh_keys_DATA = \
 -      src/templates/people/ssh-keys/delete.html \
 -      src/templates/people/ssh-keys/error.html \
 -      src/templates/people/ssh-keys/error-invalid-key.html \
 -      src/templates/people/ssh-keys/index.html \
 -      src/templates/people/ssh-keys/upload.html
 -
 -templates_people_ssh_keysdir = $(templates_peopledir)/ssh-keys
 -
  templates_static_DATA = \
        src/templates/static/blocked.html \
-       src/templates/static/chat.html \
        src/templates/static/features.html \
        src/templates/static/legal.html \
        src/templates/static/support.html

diff --cc src/templates/base.html
Simple merge

diff --cc src/web/__init__.py
Simple merge