Merge branch 'trunk' into develop

Changes:
(translated from vkopt_log.txt):
- add smiles panel for most of input fields
- save stickers with conversation history
- im: move "delete all *" and "stats" to "actions" menu
- add Retina icons for main menu

Conflicts:
	builds/chrome/scripts/vk_main.js
	builds/chrome/scripts/vk_settings.js
	builds/chrome/scripts/vk_txtedit.js
	builds/chrome/scripts/vk_users.js
	builds/chrome/scripts/vklang.js
	builds/chrome/scripts/vkopt_log.txt
	builds/firefox/scripts/vk_face.js
	builds/firefox/scripts/vk_media.js
	builds/firefox/scripts/vk_settings.js
	builds/firefox/scripts/vk_txtedit.js
	builds/firefox/scripts/vk_users.js
	builds/firefox/scripts/vklang.js
	builds/firefox/scripts/vkopt.js
	builds/firefox/scripts/vkopt_log.txt
	builds/opera.extension/scripts/vk_face.js
	builds/opera.extension/scripts/vk_main.js
	builds/opera.extension/scripts/vk_media.js
	builds/opera.extension/scripts/vkopt.js
	builds/opera.extension/scripts/vkopt_log.txt
	builds/vkopt.safariextension/scripts/vk_face.js
	builds/vkopt.safariextension/scripts/vk_main.js
	builds/vkopt.safariextension/scripts/vk_media.js
	builds/vkopt.safariextension/scripts/vk_settings.js
	builds/vkopt.safariextension/scripts/vk_txtedit.js
	builds/vkopt.safariextension/scripts/vk_users.js
	builds/vkopt.safariextension/scripts/vklang.js
	builds/vkopt.safariextension/scripts/vkopt.js
	builds/vkopt.safariextension/scripts/vkopt_log.txt
	source/run-in-top/20_vkopt.js
	source/run-in-top/21_vk_face.js
	source/run-in-top/24_vk_main.js
	source/run-in-top/25_vk_media.js
	source/run-in-top/30_vk_txtedit.js
	source/run-in-top/31_vk_users.js
	source/run-in-top/32_vklang.js
	source/vk_face.js
	source/vk_main.js
	source/vk_media.js
	source/vk_settings.js
	source/vk_txtedit.js
	source/vk_users.js
	source/vklang.js
	source/vkopt.js
	source/vkopt_log.txt