Merge branch 'dev' into fullTextSearch
RQ
Search Field
Merge branch 'fullTextSearch' into dev

Conflicts:
	hike/__init__.py
	hike/main.py
	hike/templates/index.html