Basic stories search box is working.
Merge branch 'master' of https://github.com/miguelfermin/HybridAppDemo

Conflicts:
	www/js/controllers.js
Fixed merged error