Merge branch 'master' of github.com:RyuPiT/SharePla
Merge branch 'master' of github.com:RyuPiT/SharePla
プラン作成画面にルートタブを追加

config/routes.rb に routes_search の追加
Merge branch 'route_search_yota' into route_search
Add time tab
Merge remote-tracking branch 'remotes/origin/route_search' into timecard_kanpe

Conflicts:
	app/views/plans/new.html.erb
Merge branch 'timecard_kanpe' into timecard
Bind time btn clicked event
Move comments
Modify app/assets/stylesheets/plans.css.scss
Modifiy style marign-left .ui-state-default
Add time-card style
Add time-card to app/views/plans/new.html.erb
This is test code
Merge branch 'timecard_himajin' into timecard
Merge remote-tracking branch 'origin/timecard' into timecard
Merge branch 'timecard' into timecard_btnfunc_kanpe
Merge branch 'timecard_btnfunc_kanpe' into timecard
Merge remote-tracking branch 'origin/timecard' into timecard
Fix #main-sortable #76
Add .sortable-card
Merge branch 'fix-sortable' into timecard
Merge remote-tracking branch 'remotes/origin/timecard' into timecard