New templates to improve usability
Merge remote-tracking branch 'origin/feature/modal-store-switcher' into feature/modal-store-switcher

Conflicts:
	src/app/design/frontend/base/default/template/aligent/websiteswitcher/modal.phtml
	src/app/design/frontend/base/default/template/aligent/websiteswitcher/switcher.phtml