Updated member and main app
Merge branch 'master' of https://github.com/Forthlight/forthlight-dev