Defaults now defined on superclass
Merge branch 'master' into phonegap
Set the clientBaseUrl
Merge branch 'phonegap' into mine