Верстка
Merge remote-tracking branch 'origin/master'

Conflicts:
	Evernote/app/src/main/res/layout/note_edit_fragment.xml