WC-434 #comment Work in progress
WC-434 #comment add images
Merge remote-tracking branch 'origin/dev-SOA-2' into dev-SOA-2

Conflicts:
	index.html
	v2/js/view/notepadView.js
Merge remote-tracking branch 'origin/dev-SOA-2' into dev-SOA-2

Conflicts:
	index.html
	v2/js/view/notepadView.js