added how-to, add button puts friend names on 2 lines, facebook name no longer searchable
conflicts resolved