conflict resolving: Merge branch 'master-jan11-2013-phone-extention-fix'
drwxr-xr-x - css
drwxr-xr-x - images
drwxr-xr-x - js
drwxr-xr-x - xml