Merge branch 'master' of https://github.com/TeamOfFBAuto/FBAuto

Conflicts:
FBAuto/FBAuto/AppDelegate.m
s

s