merge

res/values/strings.xml

res/xml/account_creation_preferences.xml

src/com/savoirfairelinux/sflphone/account/AccountDetail.java

...oirfairelinux/sflphone/account/AccountDetailAdvanced.java

...savoirfairelinux/sflphone/account/AccountDetailBasic.java

.../savoirfairelinux/sflphone/account/AccountDetailSrtp.java

...m/savoirfairelinux/sflphone/account/AccountDetailTls.java

...oirfairelinux/sflphone/account/AccountDetailsHandler.java

...avoirfairelinux/sflphone/account/AccountManagementUI.java

...rfairelinux/sflphone/account/AccountSelectionSpinner.java

...fairelinux/sflphone/adapters/AccountSelectionAdapter.java

...avoirfairelinux/sflphone/adapters/CallElementAdapter.java

...irfairelinux/sflphone/client/AccountCreationActivity.java

...fairelinux/sflphone/client/AccountPreferenceActivity.java

...oirfairelinux/sflphone/client/AccountSelectionDialog.java

src/com/savoirfairelinux/sflphone/client/CallActivity.java

...com/savoirfairelinux/sflphone/client/CallElementView.java

...com/savoirfairelinux/sflphone/client/CustomListEntry.java

src/com/savoirfairelinux/sflphone/client/Data.java

src/com/savoirfairelinux/sflphone/client/SFLPhoneHome.java