resolve merge conflict Symeetry/HomeViewController.m
Merge branch 'beacon'