Merge origin/master

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

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

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

Conflicts:
	wp-content/themes/wordpress-bootstrap-master/single-flat.php
get_flats_props_by_program 
+ treti parametr na exclude bytu podle id bytu