fixed zip code regex to work with js regexp tool. js doesn't support the 'i' modifier
Merge branch 'master' into nbha