ATP-8456: Fixed api doc comments to work with dox.
Merge branch 'feature-0.9.x/ATP-8456-fixed-api-doc-comments' into release-0.9.x
release 0.9.4
release v0.9.5
(#5): Testing: The run_spec-script (used to set up the spec tests) now loads controls declared in the widget.json
Merge branch 'feature-0.9.x/5-testbed-must-load-controls' into release-0.9.x
#6: the portal now initializes an i18n object on the root scope.
Merge branch 'feature-0.9.x/6-initializing-i18n-on-root-scope' into release-0.9.x
release 0.9.6
Merge tag 'v0.9.5' into release-0.9.x

version 0.9.5

* tag 'v0.9.5':
  release v0.9.5

Conflicts:
	bower.json
Merge tag 'v0.9.4' into release-0.9.x

version 0.9.4

* tag 'v0.9.4':
  release 0.9.4
  ATP-8456: Fixed api doc comments to work with dox.

Conflicts:
	bower.json
(#7): Fixed version information in changelog on release-0.9.x branch.
(#8) Fixed the cleanup mechanism for generated widget areas.
Merge branch 'feature-0.9.x/8-fix-cleanup-of-added-widget-areas' into release-0.9.x
release v0.9.8
(#9): Update Bower (minor), Grunt (patch)
(#9): Update CHANGELOG.md (fixes #9)
Merge branch 'feature-0.9.x/9-update-bower' into release-0.9.x

* feature-0.9.x/9-update-bower:
  (#9): Update CHANGELOG.md (fixes #9)
  (#9): Update Bower (minor), Grunt (patch)