Removed prefix for us_states and canada regions
udpated error page messages
merging files
merging files
Merge branch 'online-distribution.v2'