Use escapeHtml() function instead of deprecated htmlEscape() function
Merge branch 'follow-1.8.1-changes' of github.com:anatolykazantsev/Inchoo_SocialConnect into anatolykazantsev-follow-1.8.1-changes
Merge branch 'anatolykazantsev-follow-1.8.1-changes' into develop