adding search and filtering to the app
Merge branch 'master' of https://github.com/nirgit/ngplay

Conflicts:
	index.html
	js/controllers.js