Merge branch 'hotfix/$observe'
Merge branch 'master' of github.com:onetalk/ui