Change Display file and directory for storage files
Merge branch 'mmukai-operation_logs'
Merge branch 'storage_files' of github.com:mmukai/zomeki-development into mmukai-storage_files
Merge branch 'mmukai-storage_files'
Add schema
Rebuild gp_article docs for smartphone
Rebuild map
Export static files
Add process manager
Merge branch 'prosess_manager' of github.com:mmukai/zomeki-development into mmukai-prosess_manager
Merge branch 'mmukai-prosess_manager'
Update schema
Add File Transfer Function
Merge branch 'file-transfer' of github.com:m-miki/zomeki-development into m-miki-file-transfer

Conflicts:
	db/schema.rb
Merge branch 'm-miki-file-transfer'
modify file transfer
Merge branch 'm-miki-modify_file-transfer'
Route Search(JavaScript Error Correction)
Merge branch 'okigin' of github.com:tao-k/zomeki-development into tao-k-okigin
Merge branch 'tao-k-okigin'