Feature/notes field

I cleaned up the branch so that only Pages, Forms and Links display a Notes field.

Also merged from the master branch into the feature/Notes-field branch and resolved all conflicts.

Should be a clean merge .