Fix public/?
Add search plugin
Add search and spin
Merged master into js

Conflicts:
	templates/index.html