Added search and details page, fix SO MANY errors
Merge branch 'master' of https://github.com/oliver-spryn/merchancs

Conflicts:
	index.html