city to database and cookie
Merge branch 'city_from_ip' into development

Conflicts:
	composer.json
	composer.lock