add order and remove
Merge branch 'hosaka' into develop

Conflicts:
	app/images/sample_tabletop.png
	app/images/sticker/ConoHa.png
	app/images/sticker/DMTC.png
	app/images/sticker/IMG_3195.png
	app/images/sticker/adobe_dreamweaver.png
	app/images/sticker/adove_ai.png
	app/images/sticker/adove_fl.png
	app/images/sticker/adove_ps.png
	app/images/sticker/akatsuki.png
	app/images/sticker/chatworks.png
	app/images/sticker/colo_01.png
	app/images/sticker/colo_c.png
	app/images/sticker/corabbit.png
	app/images/sticker/css3.png
	app/images/sticker/donuts_logo.png
	app/images/sticker/drecom.png
	app/images/sticker/drecom_hentai.png
	app/images/sticker/gaiax.png
	app/images/sticker/generace.png
	app/images/sticker/github.png
	app/images/sticker/gloops.png
	app/images/sticker/h1_logo.png
	app/images/sticker/herlock.png
	app/images/sticker/herlock_02.png
	app/images/sticker/html5.png
	app/images/sticker/img_ss_hamee.png
	app/images/sticker/javascript.png
	app/images/sticker/klanb_games.png
	app/images/sticker/leve_b.png
	app/images/sticker/leve_w.png
	app/images/sticker/logo_klab.png
	app/images/sticker/mercari.png
	app/images/sticker/oisix.png
	app/images/sticker/oro.png
	app/images/sticker/platform_01.png
	app/images/sticker/pyfes.png
	app/images/sticker/riak_001.png
	app/images/sticker/riak_002.png
	app/images/sticker/riak_003.png
	app/images/sticker/riak_004.png
	app/images/sticker/usagee.png
	app/images/sticker/wakame.png
	app/images/sticker/wordpress_logo.png
	app/images/sticker/wordpress_logo_b.png
	app/scripts/controllers/put_sticker.js
jQueryのバージョンアップ
jqueryテスト部分の削除
fix rotate bug
ヘッダー編集中
Merge branch 'hosaka' into develop

Conflicts:
	app/scripts/controllers/put_sticker.js
Merge branch 'edit_select_tabletop_page' into develop
Merge branch 'develop' into navibar-edit
Merge branch 'edit_select_tabletop_page' into develop
Merge branch 'develop' into navibar-edit
見た目は大体おｋ
サイズ合わせ
Merge branch 'navibar-edit' into develop
Merge branch 'develop' into edit_select_tabletop_page