commit
Merge branch 'master' of https://github.com/mohssenfathi/Jott

Conflicts:
	Jott/View Note/MFViewNoteViewController.mm