Added images to notes
Merge origin/master

Conflicts:
	lib/IPE/Apps/KeepNotes/Model/Note.php
fixed relation