Trash
Moved to new version of dx #4
Merge remote-tracking branch 'origin/master'

Conflicts:
	controllers/city.php
	static/js/script.js