$timeout -> setTimeout
Merge branch 'master' of github.com:entermedia-community/app-workspace
Merge remote-tracking branch 'origin/master'