Near-final version of front-end
Merge branch 'master' of https://github.com/ses110/FB_CRM