Merge branch 'dev'

* dev:
  JSON error checking added and app view added back to repo.
  .gitignore, added.
Merge branch 'dev'

* dev:
  Offline company information removed.
  Console logging stopped and attached to debug mode.
  Update.js, cleaning issue has reappeared.
hot fix, InfoPageDetailContainerCarouselContainerView.js:18 remark error
v1.2014012901

Merge branch 'hot-fix'

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

Conflicts:
	app/view/info/InfoPageDetailContainerCarouselContainerView.js
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