Updated symlinks
Merge pull request #209 from bhariharan/master

Updated symlinks
Merge pull request #216 from bhariharan/unstable

Fix Typos
Make app display name substitutable
Merge pull request #219 from bhariharan/passcode_strings

Make app display name substitutable
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