cities
,
update table
Merge origin/master

Conflicts:
	wp-content/themes/wordpress-bootstrap-master/front-page.php
	wp-content/themes/wordpress-bootstrap-master/our-program-page.php
	wp-content/themes/wordpress-bootstrap-master/single-flat.php
	wp-content/themes/wordpress-bootstrap-master/single-program.php
Merge origin/master