Merge branch 'develop'
update merge
XDomain support
added parsing and xdom wrkarounds