Fixing ui for multiple screen issue, working on keep login
fixed ui for multiole screen issue and continue work on keep login function
final beta version,
start little fixing on ui, change layout to framlayout and more pading
Merge branch 'master' of https://github.com/taoobb/AdoptionSTARt

Conflicts:
	AndroidManifest.xml
	bin/AdoptionSTAR.apk
	bin/AndroidManifest.xml
	bin/R.txt
	bin/classes.dex
	bin/classes/com/quinlan/adoptionstar/ConfigurationActivity$1.class
	bin/classes/com/quinlan/adoptionstar/ConfigurationActivity$2.class
	bin/classes/com/quinlan/adoptionstar/ConfigurationActivity$DownloadImageTask.class
	bin/classes/com/quinlan/adoptionstar/ConfigurationActivity$Error.class
	bin/classes/com/quinlan/adoptionstar/ConfigurationActivity.class
	bin/classes/com/quinlan/adoptionstar/ContactActivity.class
	bin/classes/com/quinlan/adoptionstar/CreateActivity$1.class
	bin/classes/com/quinlan/adoptionstar/CreateActivity$CreateTask.class
	bin/classes/com/quinlan/adoptionstar/CreateActivity$Error.class
	bin/classes/com/quinlan/adoptionstar/CreateActivity.class
	bin/classes/com/quinlan/adoptionstar/FamilyActivity$FamilyTask.class
	bin/classes/com/quinlan/adoptionstar/FamilyActivity.class
	bin/classes/com/quinlan/adoptionstar/FamilyAdapter$1.class
	bin/classes/com/quinlan/adoptionstar/FamilyAdapter$FamilyHolder.class
	bin/classes/com/quinlan/adoptionstar/FamilyAdapter.class
	bin/classes/com/quinlan/adoptionstar/FamilyDetailActivity$1.class
	bin/classes/com/quinlan/adoptionstar/FamilyDetailActivity$2.class
	bin/classes/com/quinlan/adoptionstar/FamilyDetailActivity.class
	bin/classes/com/quinlan/adoptionstar/FamilyRow.class
	bin/classes/com/quinlan/adoptionstar/ImageUploader.class
	bin/classes/com/quinlan/adoptionstar/JSONParser.class
	bin/classes/com/quinlan/adoptionstar/LoginActivity$1.class
	bin/classes/com/quinlan/adoptionstar/LoginActivity$2.class
	bin/classes/com/quinlan/adoptionstar/LoginActivity$3.class
	bin/classes/com/quinlan/adoptionstar/LoginActivity$4.class
	bin/classes/com/quinlan/adoptionstar/LoginActivity$5.class
	bin/classes/com/quinlan/adoptionstar/LoginActivity$6.class
	bin/classes/com/quinlan/adoptionstar/LoginActivity$7.class
	bin/classes/com/quinlan/adoptionstar/LoginActivity$8.class
	bin/classes/com/quinlan/adoptionstar/LoginActivity$ForgotTask.class
	bin/classes/com/quinlan/adoptionstar/LoginActivity$UserLoginTask.class
	bin/classes/com/quinlan/adoptionstar/LoginActivity.class
	bin/classes/com/quinlan/adoptionstar/MainActivity$1.class
	bin/classes/com/quinlan/adoptionstar/MainActivity$2.class
	bin/classes/com/quinlan/adoptionstar/MainActivity$3.class
	bin/classes/com/quinlan/adoptionstar/MainActivity$4.class
	bin/classes/com/quinlan/adoptionstar/MainActivity.class
	bin/classes/com/quinlan/adoptionstar/MenuActivity.class
	bin/classes/com/quinlan/adoptionstar/NextActivity.class
	bin/classes/com/quinlan/adoptionstar/R$drawable.class
	bin/classes/com/quinlan/adoptionstar/R$id.class
	bin/classes/com/quinlan/adoptionstar/R$layout.class
	bin/classes/com/quinlan/adoptionstar/R$menu.class
	bin/classes/com/quinlan/adoptionstar/R$string.class
	bin/classes/com/quinlan/adoptionstar/R$style.class
	bin/classes/com/quinlan/adoptionstar/R$styleable.class
	bin/classes/com/quinlan/adoptionstar/R$xml.class
	bin/classes/com/quinlan/adoptionstar/WebViewActivity.class
	bin/classes/com/quinlan/adoptionstar/WelcomeActivity$1.class
	bin/classes/com/quinlan/adoptionstar/WelcomeActivity$2.class
	bin/classes/com/quinlan/adoptionstar/WelcomeActivity$3.class
	bin/classes/com/quinlan/adoptionstar/WelcomeActivity$DownloadImageTask.class
	bin/classes/com/quinlan/adoptionstar/WelcomeActivity.class
	bin/dexedLibs/google-play-services-504967d2223d1d270e78895ca25ec8f9.jar
	bin/dexedLibs/google-play-services_lib-7a3c36671258db1039c1bbf56e481a88.jar
	bin/dexedLibs/httpclient-4.2.5-c5ab97c0f2682577441dda7820a8546d.jar
	bin/dexedLibs/httpmime-4.2.5-a22fb28149dada4c715dd6e3b6fd7063.jar
	bin/resources.ap_
	gen/com/quinlan/adoptionstar/R.java
	libs/google-play-services_lib/bin/google-play-services_lib.jar
	libs/google-play-services_lib/project.properties
	project.properties
	res/layout/activity_contact.xml
	res/layout/activity_create.xml
	res/layout/activity_family_detail.xml
	res/layout/activity_family_row.xml
	res/layout/activity_welcome.xml
	res/menu/welcome.xml
	res/values/strings.xml
	src/com/quinlan/adoptionstar/ConfigurationActivity.java
	src/com/quinlan/adoptionstar/ContactActivity.java
	src/com/quinlan/adoptionstar/CreateActivity.java
	src/com/quinlan/adoptionstar/FamilyActivity.java
	src/com/quinlan/adoptionstar/FamilyAdapter.java
	src/com/quinlan/adoptionstar/FamilyDetailActivity.java
	src/com/quinlan/adoptionstar/FamilyRow.java
	src/com/quinlan/adoptionstar/ImageUploader.java
	src/com/quinlan/adoptionstar/JSONParser.java
	src/com/quinlan/adoptionstar/LoginActivity.java
	src/com/quinlan/adoptionstar/MainActivity.java
	src/com/quinlan/adoptionstar/NextActivity.java
	src/com/quinlan/adoptionstar/WebViewActivity.java
	src/com/quinlan/adoptionstar/WelcomeActivity.java