Updates for search and layout
Merge branch 'master' of https://github.com/princefarming/Dubleplus

Conflicts:
	public/stylesheets/style.css