Merge branch 'master' into people_overhaul
upgrade select2 to 3.5.2
migrate the compose message recipient box to the people service
Merge branch 'people_overhaul' into testing