中断
Merge branch 'develop' of https://github.com/jec-11jz/bridge into develop
Merge branch 'develop' of https://github.com/jec-11jz/bridge into develop
Merge branch 'develop' of https://github.com/jec-11jz/bridge into develop
import ckeditor and kcfinder;
Merge branch 'feature/change_UI' into develop

Conflicts:
	app/View/Blogs/add.ctp
微調整
Merge branch 'develop' of https://github.com/jec-11jz/bridge into develop
復元
ブログの編集機能実装
add
Merge branch 'develop' of https://github.com/jec-11jz/bridge into develop
complete login on js
競合解消
モーダルちょいへん
Merge branch 'develop' of https://github.com/jec-11jz/bridge into develop

Conflicts:
	app/View/Layouts/menu.ctp
modalのエラー修正
jsのリダイレクトを関数化
bootstrap3
js footerfix 削除