pr
Merge remote-tracking branch 'origin/Design-Master-page' into Design-Master-page

Conflicts:
	AdvocateDigitalDiary.v11.suo