Images are now same on development and production
Restructuring and added categories
Initial implementation of autocomplete
Oups, not storing object in q, but text.
Reimplemented categories, however only time and place
Added categories_int
Merge branch 'master' into testing

Conflicts:
	lib/controllers/search.js