main views finished
fb singleton added
pods added
pods added
conflicts resolving
conflict resolved
conflict resolved
Merge branch 't1_contact'