Merge branch 'master' into people_overhaul

Conflicts:
	documents/js/directives.js
add space to notification. Fixes #1270
fix address fetching and some minor profile viewing bugs
Merge branch 'people_overhaul' into testing

Conflicts:
	cmn/services.js