Fix for friend
Opt-out fix
Merge branch 'development' of github.com:loed-idzinga/lifefire into development