added dynamic dropdown for country state and city
Merge branch 'B-master'

Conflicts:
	public/js/registro-wizard.js
merge