changes
Merge remote-tracking branch 'origin/master'
changes, locations and addressses
Merge remote-tracking branch 'origin/master'

Conflicts:
	ski/src/app/webroot/css/layouts/login_layout.css