update-source piaf
Merge branch 'master' of https://github.com/phonglam29305/FAMail

Conflicts:
	FAMail_Back/webapp/page/backend/dashboard.html
	FAMail_Back/webapp/resource/other/FancySlidingForm/index.html
	FAMail_Back/webapp/resource/other/ckeditor/CHANGES.html
	FAMail_Back/webapp/resource/other/ckeditor/INSTALL.html
	FAMail_Back/webapp/resource/other/ckeditor/LICENSE.html
	FAMail_Back/webapp/resource/other/ckeditor/plugins/preview/preview.html
	FAMail_Back/webapp/resource/other/ckeditor/plugins/wsc/dialogs/ciframe.html
	FAMail_Back/webapp/resource/other/ckeditor/plugins/wsc/dialogs/tmpFrameset.html
	FAMail_Back/webapp/resource/other/tiny_mce/plugins/advhr/rule.htm
	FAMail_Back/webapp/resource/other/tiny_mce/plugins/advimage/image.htm
	FAMail_Back/webapp/resource/other/tiny_mce/plugins/advlink/link.htm
	FAMail_Back/webapp/resource/other/tiny_mce/plugins/emotions/emotions.htm
	FAMail_Back/webapp/resource/other/tiny_mce/plugins/example/dialog.htm
	FAMail_Back/webapp/resource/other/tiny_mce/plugins/fullpage/fullpage.htm
	FAMail_Back/webapp/resource/other/tiny_mce/plugins/fullscreen/fullscreen.htm
	FAMail_Back/webapp/resource/other/tiny_mce/plugins/inlinepopups/template.htm
	FAMail_Back/webapp/resource/other/tiny_mce/plugins/media/media.htm
	FAMail_Back/webapp/resource/other/tiny_mce/plugins/paste/pastetext.htm
	FAMail_Back/webapp/resource/other/tiny_mce/plugins/paste/pasteword.htm
	FAMail_Back/webapp/resource/other/tiny_mce/plugins/preview/example.html
	FAMail_Back/webapp/resource/other/tiny_mce/plugins/preview/preview.html
	FAMail_Back/webapp/resource/other/tiny_mce/plugins/searchreplace/searchreplace.htm
	FAMail_Back/webapp/resource/other/tiny_mce/plugins/style/props.htm
	FAMail_Back/webapp/resource/other/tiny_mce/plugins/table/cell.htm
	FAMail_Back/webapp/resource/other/tiny_mce/plugins/table/merge_cells.htm
	FAMail_Back/webapp/resource/other/tiny_mce/plugins/table/row.htm
	FAMail_Back/webapp/resource/other/tiny_mce/plugins/table/table.htm
	FAMail_Back/webapp/resource/other/tiny_mce/plugins/template/blank.htm
	FAMail_Back/webapp/resource/other/tiny_mce/plugins/template/template.htm
	FAMail_Back/webapp/resource/other/tiny_mce/plugins/xhtmlxtras/abbr.htm
	FAMail_Back/webapp/resource/other/tiny_mce/plugins/xhtmlxtras/acronym.htm
	FAMail_Back/webapp/resource/other/tiny_mce/plugins/xhtmlxtras/attributes.htm
	FAMail_Back/webapp/resource/other/tiny_mce/plugins/xhtmlxtras/cite.htm
	FAMail_Back/webapp/resource/other/tiny_mce/plugins/xhtmlxtras/del.htm
	FAMail_Back/webapp/resource/other/tiny_mce/plugins/xhtmlxtras/ins.htm
	FAMail_Back/webapp/resource/other/tiny_mce/themes/advanced/about.htm
	FAMail_Back/webapp/resource/other/tiny_mce/themes/advanced/anchor.htm
	FAMail_Back/webapp/resource/other/tiny_mce/themes/advanced/charmap.htm
	FAMail_Back/webapp/resource/other/tiny_mce/themes/advanced/color_picker.htm
	FAMail_Back/webapp/resource/other/tiny_mce/themes/advanced/image.htm
	FAMail_Back/webapp/resource/other/tiny_mce/themes/advanced/link.htm
	FAMail_Back/webapp/resource/other/tiny_mce/themes/advanced/shortcuts.htm
	FAMail_Back/webapp/resource/other/tiny_mce/themes/advanced/source_editor.htm
	FAMail_Back/webapp/template/backend/management.master