Merge branch 'aa'

Conflicts:
	.gitignore
	_TwilioApp/.classpath
	_TwilioApp/.settings/org.eclipse.jdt.core.prefs
	_TwilioApp/AndroidManifest.xml
	_TwilioApp/bin/AndroidManifest.xml
	_TwilioApp/bin/resources.ap_
	_TwilioApp/gen/com/dolph/twilioapp/R.java
	_TwilioApp/res/layout/activity_login.xml
	_TwilioApp/res/layout/fragment_call.xml
	_TwilioApp/res/layout/fragment_contact.xml
	_TwilioApp/res/layout/fragment_record.xml
	_TwilioApp/src/com/dolph/twilioapp/AppValues.java
	_TwilioApp/src/com/dolph/twilioapp/activity/call/CallActivity.java
	_TwilioApp/src/com/dolph/twilioapp/activity/contact/ContactActivity.java
	_TwilioApp/src/com/dolph/twilioapp/activity/contact/ContactListActivity.java
	_TwilioApp/src/com/dolph/twilioapp/activity/contact/NewContactActivity.java
	_TwilioApp/src/com/dolph/twilioapp/activity/login/LoginActivity.java
	_TwilioApp/src/com/dolph/twilioapp/activity/main/NavigationActivity.java
	_TwilioApp/src/com/dolph/twilioapp/activity/main/SuccessActivity.java
	_TwilioApp/src/com/dolph/twilioapp/activity/password/GetForgetCodeActivity.java
	_TwilioApp/src/com/dolph/twilioapp/activity/password/ResetPasswordActivity.java
	_TwilioApp/src/com/dolph/twilioapp/activity/record/RecordListActivity.java
	_TwilioApp/src/com/dolph/twilioapp/activity/register/GetRegisterCodeActivity.java
	_TwilioApp/src/com/dolph/twilioapp/activity/register/RegisterActivity.java
	_TwilioApp/src/com/dolph/twilioapp/activity/register/RegisterSuccessActivity.java
	_TwilioApp/src/com/dolph/twilioapp/twilio/CallPhoneService.java
	_TwilioApp/src/com/dolph/utils/HttpUtils.java
	_TwilioApp/src/com/dolph/utils/Utils.java