plagin a book place
Merge remote-tracking branch 'origin/master'

Conflicts:
	book-a-place/class-book-a-place.php