From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Fri, 11 Jan 2019 11:13:52 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into 3dflip
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=c15f833c1434872fc57546bdd30ad05bd5dce61d;p=fluidbook-html5.git

Merge remote-tracking branch 'origin/master' into 3dflip

# Conflicts:
#	js/libs/fluidbook/fluidbook.js
#	js/libs/fluidbook/fluidbook.support.js
---

c15f833c1434872fc57546bdd30ad05bd5dce61d