Merge branch 'master' of https://github.com/yasumasakataoka/RROBLK

Conflicts:
	v084/app/assets/javascripts/gantt/ganttDrawer.js
	v084/app/controllers/screen_controller.rb
	v084/app/views/gantt/_divgantt.html.erb
	v084/app/views/layouts/screen.html.erb
	v084/app/views/screen/gantt.js.erb
	v084/lib/2dc_jqgrid/2dc_jqgrid.rb
	v084/lib/2dc_jqgrid/3dc_jqgrid.rb
	v084/vendor/OrorBlk/sub_crt_gannt_itms.rb
Merge branch 'master' of https://github.com/yasumasakataoka/RROBLK

Conflicts:
	v084/app/assets/javascripts/gantt/ganttDrawer.js
	v084/app/controllers/screen_controller.rb
	v084/app/views/gantt/_divgantt.html.erb
	v084/app/views/layouts/screen.html.erb
	v084/app/views/screen/gantt.js.erb
	v084/lib/2dc_jqgrid/2dc_jqgrid.rb
	v084/lib/2dc_jqgrid/3dc_jqgrid.rb
	v084/vendor/OrorBlk/sub_crt_gannt_itms.rb