add search with keyup
Some fixes
Merge all

Conflicts:
	index.html
	js/main.js