Properties
Merge remote-tracking branch 'origin/master'

Conflicts:
	FieldNotebook/project.properties
Fixed myMarkersToStringMarkers function
Pulled in note.xml changes, for multiline comment on note
Merge remote-tracking branch 'origin/master'
Changed xml colors of note and slider.