Facebook integration
Merge branch '2-0-stable' into 2-0-dev
Koala fix for travis