JS city filtering.

Contents can now be filtered by city.
Merge branch 'master' of https://github.com/woitee/test-project-php

Conflicts:
	views/index.php