Add fields to locationWizard
resync
Merge branch 'master' of https://github.com/art-ist/onYOURway

Conflicts:
	onYOURway/App/_styles/themes/onYOURway-2/_onYOURway.css