updated export namespaces
Merge branch 'feature/tracking' into intouch-development
updated event proxies
export events
Merge branch 'feature/tracking' into intouch-development
more ambiguous event behavior.. changed back to proxies
Merge branch 'feature/tracking' into intouch-development