Merge remote-tracking branch 'origin/master' into slider

author Vincent Vanwaelscappel <vincent@cubedesigners.com>

Wed, 28 Jun 2017 16:05:12 +0000 (18:05 +0200)

committer Vincent Vanwaelscappel <vincent@cubedesigners.com>

Wed, 28 Jun 2017 16:05:12 +0000 (18:05 +0200)
author Vincent Vanwaelscappel <vincent@cubedesigners.com>
Wed, 28 Jun 2017 16:05:12 +0000 (18:05 +0200)
committer Vincent Vanwaelscappel <vincent@cubedesigners.com>
Wed, 28 Jun 2017 16:05:12 +0000 (18:05 +0200)
diff --cc js/libs/fluidbook/fluidbook.menu.js
Simple merge
diff --cc js/main.js
Simple merge
diff --cc style/fluidbook.less
Simple merge
author	Vincent Vanwaelscappel <vincent@cubedesigners.com>
	Wed, 28 Jun 2017 16:05:12 +0000 (18:05 +0200)
committer	Vincent Vanwaelscappel <vincent@cubedesigners.com>
	Wed, 28 Jun 2017 16:05:12 +0000 (18:05 +0200)
		1	2
js/libs/fluidbook/fluidbook.menu.js	patch \|	diff1 \|	diff2 \|	blob \| history
js/main.js	patch \|	diff1 \|	diff2 \|	blob \| history
style/fluidbook.less	patch \|	diff1 \|	diff2 \|	blob \| history