samanthas first commit
Samantha's first commit
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.metadata/.lock
	.metadata/.plugins/org.eclipse.team.cvs.core/.running
	NCWITMOBILEAPP-Android/.classpath
	NCWITMOBILEAPP-Android/.factorypath
	NCWITMOBILEAPP-Android/.settings/org.eclipse.jdt.core.prefs
	NCWITMOBILEAPP-Android/bin/README
	NCWITMOBILEAPP-Android/bin/classes/com/ncwitmobileapp/AccountsActivity$1.class
	NCWITMOBILEAPP-Android/bin/classes/com/ncwitmobileapp/AccountsActivity$2.class
	NCWITMOBILEAPP-Android/bin/classes/com/ncwitmobileapp/AccountsActivity$3.class
	NCWITMOBILEAPP-Android/bin/classes/com/ncwitmobileapp/AccountsActivity$4.class
	NCWITMOBILEAPP-Android/bin/classes/com/ncwitmobileapp/AccountsActivity$5$1.class
	NCWITMOBILEAPP-Android/bin/classes/com/ncwitmobileapp/AccountsActivity$5.class
	NCWITMOBILEAPP-Android/bin/classes/com/ncwitmobileapp/AccountsActivity.class
	NCWITMOBILEAPP-Android/bin/classes/com/ncwitmobileapp/AndroidRequestTransport.class
	NCWITMOBILEAPP-Android/bin/classes/com/ncwitmobileapp/BuildConfig.class
	NCWITMOBILEAPP-Android/bin/classes/com/ncwitmobileapp/C2DMReceiver.class
	NCWITMOBILEAPP-Android/bin/classes/com/ncwitmobileapp/DeviceRegistrar$1.class
	NCWITMOBILEAPP-Android/bin/classes/com/ncwitmobileapp/DeviceRegistrar.class
	NCWITMOBILEAPP-Android/bin/classes/com/ncwitmobileapp/Manifest$permission.class
	NCWITMOBILEAPP-Android/bin/classes/com/ncwitmobileapp/Manifest.class
	NCWITMOBILEAPP-Android/bin/classes/com/ncwitmobileapp/MessageDisplay.class
	NCWITMOBILEAPP-Android/bin/classes/com/ncwitmobileapp/NCWITMOBILEAPPActivity$1.class
	NCWITMOBILEAPP-Android/bin/classes/com/ncwitmobileapp/NCWITMOBILEAPPActivity$2$1$1.class
	NCWITMOBILEAPP-Android/bin/classes/com/ncwitmobileapp/NCWITMOBILEAPPActivity$2$1.class
	NCWITMOBILEAPP-Android/bin/classes/com/ncwitmobileapp/NCWITMOBILEAPPActivity$2.class
	NCWITMOBILEAPP-Android/bin/classes/com/ncwitmobileapp/NCWITMOBILEAPPActivity.class
	NCWITMOBILEAPP-Android/bin/classes/com/ncwitmobileapp/R$attr.class
	NCWITMOBILEAPP-Android/bin/classes/com/ncwitmobileapp/R$drawable.class
	NCWITMOBILEAPP-Android/bin/classes/com/ncwitmobileapp/R$id.class
	NCWITMOBILEAPP-Android/bin/classes/com/ncwitmobileapp/R$layout.class
	NCWITMOBILEAPP-Android/bin/classes/com/ncwitmobileapp/R$menu.class
	NCWITMOBILEAPP-Android/bin/classes/com/ncwitmobileapp/R$string.class
	NCWITMOBILEAPP-Android/bin/classes/com/ncwitmobileapp/R.class
	NCWITMOBILEAPP-Android/bin/classes/com/ncwitmobileapp/Setup.class
	NCWITMOBILEAPP-Android/bin/classes/com/ncwitmobileapp/Util.class
	NCWITMOBILEAPP-Android/bin/classes/com/ncwitmobileapp/client/MyRequestFactory$HelloWorldRequest.class
	NCWITMOBILEAPP-Android/bin/classes/com/ncwitmobileapp/client/MyRequestFactory$MessageRequest.class
	NCWITMOBILEAPP-Android/bin/classes/com/ncwitmobileapp/client/MyRequestFactory$RegistrationInfoRequest.class
	NCWITMOBILEAPP-Android/bin/classes/com/ncwitmobileapp/client/MyRequestFactory.class
	NCWITMOBILEAPP-Android/bin/classes/com/ncwitmobileapp/shared/MessageProxy.class
	NCWITMOBILEAPP-Android/bin/classes/com/ncwitmobileapp/shared/RegistrationInfoProxy.class
	NCWITMOBILEAPP-Android/gen/README
	NCWITMOBILEAPP-Android/gen/com/ncwitmobileapp/R.java
	NCWITMOBILEAPP-Android/res/values/strings.xml
	NCWITMOBILEAPP-AppEngine/.factorypath
	NCWITMOBILEAPP-AppEngine/.gwt/.gwt-log
	NCWITMOBILEAPP-AppEngine/.settings/com.google.appengine.eclipse.core.prefs
	NCWITMOBILEAPP-AppEngine/gwt-unitCache/gwt-unitCache-00000136529D1DFE
	NCWITMOBILEAPP-AppEngine/gwt-unitCache/gwt-unitCache-00000136529FC7E0
	NCWITMOBILEAPP-AppEngine/war/WEB-INF/lib/appengine-api-1.0-sdk-1.6.1.jar
	NCWITMOBILEAPP-AppEngine/war/WEB-INF/lib/appengine-api-1.0-sdk-1.6.3.jar
	NCWITMOBILEAPP-AppEngine/war/WEB-INF/lib/appengine-api-1.0-sdk-1.6.4.jar
	NCWITMOBILEAPP-AppEngine/war/WEB-INF/lib/appengine-jsr107cache-1.6.3.jar
Removes .metadata files and restores the .classpath, .factorypath, and RegistrationInfoProxy.java files to their correct state.
Merge pull request #16 from samwill/master

Registration
Updated changes after merge with NCWITMOBILEAPP repository