google+ account login supported by Fabula now
file conflicts resolved