[IMP] improve the note issue
Merge branch 'master' into messaging-note-issue-sla

Conflicts:
	src/com/openerp/addons/note/NoteComposeActivity.java
Merge branch 'messaging-note-issue-sla'