.gitignore, patch folder added to ignore
Merge branch 'hot-fix' into dev

* hot-fix:
  hot fix, InfoPageDetailContainerCarouselContainerView.js:18 remark error

Conflicts:
	app/view/info/InfoPageDetailContainerCarouselContainerView.js
Merge branch 'master' into dev

* master:

Conflicts:
	app/view/info/InfoPageDetailContainerCarouselContainerView.js
Merge branch 'dev' into develop

* dev:
  .gitignore, patch folder added to ignore