Changing page structure
Merge branch 'master' into develop

Conflicts:
	Scans_Whiteboard/Flowchart.jpeg
	js/script.dist.js.map
no message