From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Fri, 14 Dec 2018 17:56:01 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into 3dflip
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=167a108c130abcb4123b6a5cd1845a210cf382fd;p=fluidbook-html5.git

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

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

167a108c130abcb4123b6a5cd1845a210cf382fd