allow 'grunt server' to use PhoneGap www for emulate.phonegap.com usage
Merge branch 'master' into ucsf-2.2.3