140122 Merged - NoteViewActivity