basic angularjs event searcher
Merge branches 'master' and 'work'