テンプレUIまぁ完成
Merge branch 'develop' into feature/change_UI
テンプレートUIとりあえず完成
UIをちょいのちょいと
Merge branch 'feature/change_UI' into develop
Merge branch 'develop' of https://github.com/jec-11jz/bridge into develop

Conflicts:
	app/View/Products/index.ctp
	app/View/Templates/add.ctp