a new search branch
Merge branch 'database' into search
find waters with lists UI
merged with master updates
Added the missing files from last merge
search function with sql on the way
merged find_waters med search
Merge branch 'master' into search
removed superfluous search object with function
removed testfiles
Merge remote-tracking branch 'origin/search' into list_waters
Reset changes to navigation and templates.

The list helper should not be used in such a way
The navigation should not always render the list with every other li
gray
Removed unused file reference
Search execs callback with array
Testing fixes for listUI
Added searchfield functionality
Fix formatting
Merge branch 'master' into list_waters

Conflicts:
	ifiske-app/www/index.html
	ifiske-app/www/static/js/templates.js
Merge branch 'master' into list_waters

Conflicts:
	ifiske-app/www/static/css/index.css
Cleans and updates database on each launch