Merge v2 updates from francoisfrisch/v2-plus-plus

Specifically to update the version of montage to address
some webkit compatibility issues.

Conflicts:
	ui/facadeflow.reel/facadeflow.html