added fb
home screen buttons
conflict resolution
parser test disable
Merge pull request #85 from nairys/raza_not_sammy

Raza not sammy