#2: Fixed grunt-init step in Getting-Started docs
Merge branch 'feature/2-fix-grunt-init-step-in-readme'
#3: Added url formatting for links in Readme.md
#3: Added url formatting for links in Readme.md
#4: Added missing composition features to page loader.
Merge branch 'feature/4-adding-missing-page-loader-features'
#4: Updated changelog for this issue.
(#5): Testing: The run_spec-script (used to set up the spec tests) now loads controls declared in the widget.json
Merge branch 'feature/5-testbed-must-load-controls'
#6: the portal now initializes an i18n object on the root scope.
Merge branch 'feature/6-initializing-i18n-on-root-scope'
(#8) Fixed the cleanup mechanism for generated widget areas.

Conflicts:
	CHANGELOG.md
Merge branch 'feature/8-fix-cleanup-of-added-widget-areas'
(#9): Update Bower (minor), Grunt (patch)
(#9): Update CHANGELOG.md (fixes #9)
Merge branch 'feature/9-update-bower'

* feature/9-update-bower:
  (#9): Update CHANGELOG.md (fixes #9)
  (#9): Update Bower (minor), Grunt (patch)
(#10) resolve widget.json url relative to spec dir

Reason: We can't expect the test to run at a specific
url/path, so expecting the `widget.json` to be present at the
parent directory of `window.location.path` will most likely break.
(#10) Changelog
Merge branch 'feature/10-fix-widget-json-loading-in-karma'

* feature/10-fix-widget-json-loading-in-karma:
  (#10) Changelog
  (#10) resolve widget.json url relative to spec dir
(#10) typo