Merge branch 'develop' into top-views
delete cdnify
Merge branch 'top-views' into develop
cdnify 元に戻した
edit以下でのlivereload
ナビゲーションバー編集
画面を広く
夕食後
Merge branch 'top-views' into develop
天板ページちょい書き
Merge branch 'tabletop-edit' into develop
Merge branch 'edit_select_tabletop_page' into develop

Conflicts:
	app/views/partials/edit/select_tabletop.html
	app/views/partials/main.html
	app/views/partials/navbar.html
select_stickerとselect_tabletop入れ替え(ミスってた)
Merge remote-tracking branch 'origin/develop' into edit_select_tabletop_page

Conflicts:
	app/views/partials/edit/select_tabletop.html