Updated Note 5
Merge branch 'branch1'

Conflicts:
	Note.xml