Merge branch 'top-views' into develop
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入れ替え(ミスってた)
jquery->angular
まぁまぁ動く
Merge branch 'edit_put_stiker_page' into develop
Merge branch 'develop' into top-views
footer変更