Fixed problems with html escaped characters mixed within javascript code
Merge branch 'master' of github.com:buddycloud/buddycloud.com