Merge pull request #266 from khawkins/unstable20

Merging master into unstable20
Set VF Domain Cookies using a Hidden UIWebView
Add UIWebViewDelegate
Minor refactoring
Merge pull request #267 from bhariharan/unstable20

Set VF Domain Cookies using a Hidden UIWebView
Point to the latest shared repo commit
Merge pull request #268 from bhariharan/master

Point to the latest shared repo commit
Merge branch 'master' into unstable20
Merge pull request #269 from bhariharan/unstable20

Merge 'master' into unstable20
Fixing path name issue in template installs
Merge pull request #277 from khawkins/fix_build_script

Fixing path name issue in template installs
Merge remote-tracking branch 'origin/master' into unstable20

Conflicts:
	hybrid/sfdc_build/build.xml
	native/sfdc_build/build.xml