Improved search to include cities and countries
Merge branch 'master' of https://github.com/CraigDem/ilwhack.namepending

Conflicts:
	application/views/assets/main.php