Updated symlinks
Merge pull request #209 from bhariharan/master

Updated symlinks
Merge pull request #220 from bhariharan/unstable20

Merge 'unstable' into unstable20
Update native/SalesforceSDK/src/com/salesforce/androidsdk/app/ForceApp.java

Changed the description of getUserAgent() to "get" rather than "set" the user agent string.
allow display type for oauth login flow to be configurable by the application using the SDK.
Merge pull request #221 from superfell/master

allow login UI type to set to something other than "mobile"
Merge branch 'master' into unstable
Merge pull request #222 from bhariharan/unstable

Merge branch 'master' into unstable
Merge branch 'unstable' into unstable20