add link new_hotel
add index_place
Merge remote-tracking branch 'origin/fix_admin' into dev

Conflicts:
	.idea/workspace.xml
	app/views/blog_categories/show.html.haml
	app/views/cities/show.html.haml
	app/views/hotels/index.html.haml