Updated address type form to prevent having to load all the states when no country is selected
Merge origin/master