I had issues with my last repo, so I started over
Merge https://github.com/SonderSocialNetworking/Android

Conflicts:
	.classpath
	.project
	.settings/org.eclipse.jdt.core.prefs
	AndroidManifest.xml
	LICENSE
	README.md
	bin/AndroidManifest.xml
	bin/Sonder.apk
	bin/classes.dex
	bin/classes/com/g08/sonder/LogIn.class
	bin/classes/com/g08/sonder/R$attr.class
	bin/classes/com/g08/sonder/R$drawable.class
	bin/classes/com/g08/sonder/R$id.class
	bin/classes/com/g08/sonder/R$layout.class
	bin/classes/com/g08/sonder/R$menu.class
	bin/classes/com/g08/sonder/R$string.class
	bin/classes/com/g08/sonder/R$style.class
	bin/classes/com/g08/sonder/R.class
	bin/classes/com/g08/sonder/Register.class
	bin/dexedLibs/Parse-1.4.0-157f51ea738b6da80951964e68c036f2.jar
	bin/dexedLibs/android-support-v4-3f4fae87554e6252d778cf4df422d477.jar
	bin/dexedLibs/annotations-9435d52cefa85747ea3a12544c2dd84f.jar
	bin/res/crunch/drawable-hdpi/ic_action_search.png
	bin/res/crunch/drawable-hdpi/ic_launcher.png
	bin/res/crunch/drawable-mdpi/ic_action_search.png
	bin/res/crunch/drawable-mdpi/ic_launcher.png
	bin/res/crunch/drawable-xhdpi/ic_action_search.png
	bin/res/crunch/drawable-xhdpi/ic_launcher.png
	bin/resources.ap_
	gen/com/g08/sonder/BuildConfig.java
	gen/com/g08/sonder/R.java
	libs/Parse-1.4.0-javadoc/allclasses-frame.html
	libs/Parse-1.4.0-javadoc/allclasses-noframe.html
	libs/Parse-1.4.0-javadoc/com/parse/CountCallback.html
	libs/Parse-1.4.0-javadoc/com/parse/DeleteCallback.html
	libs/Parse-1.4.0-javadoc/com/parse/FindCallback.html
	libs/Parse-1.4.0-javadoc/com/parse/FunctionCallback.html
	libs/Parse-1.4.0-javadoc/com/parse/GetCallback.html
	libs/Parse-1.4.0-javadoc/com/parse/GetDataCallback.html
	libs/Parse-1.4.0-javadoc/com/parse/LocationCallback.html
	libs/Parse-1.4.0-javadoc/com/parse/LogInCallback.html
	libs/Parse-1.4.0-javadoc/com/parse/Parse.html
	libs/Parse-1.4.0-javadoc/com/parse/ParseACL.html
	libs/Parse-1.4.0-javadoc/com/parse/ParseAnalytics.html
	libs/Parse-1.4.0-javadoc/com/parse/ParseAnonymousUtils.html
	libs/Parse-1.4.0-javadoc/com/parse/ParseClassName.html
	libs/Parse-1.4.0-javadoc/com/parse/ParseCloud.html
	libs/Parse-1.4.0-javadoc/com/parse/ParseException.html
	libs/Parse-1.4.0-javadoc/com/parse/ParseFacebookUtils.html
	libs/Parse-1.4.0-javadoc/com/parse/ParseFile.html
	libs/Parse-1.4.0-javadoc/com/parse/ParseGeoPoint.html
	libs/Parse-1.4.0-javadoc/com/parse/ParseImageView.html
	libs/Parse-1.4.0-javadoc/com/parse/ParseInstallation.html
	libs/Parse-1.4.0-javadoc/com/parse/ParseObject.html
	libs/Parse-1.4.0-javadoc/com/parse/ParsePush.html
	libs/Parse-1.4.0-javadoc/com/parse/ParseQuery.CachePolicy.html
	libs/Parse-1.4.0-javadoc/com/parse/ParseQuery.html
	libs/Parse-1.4.0-javadoc/com/parse/ParseQueryAdapter.OnQueryLoadListener.html
	libs/Parse-1.4.0-javadoc/com/parse/ParseQueryAdapter.QueryFactory.html
	libs/Parse-1.4.0-javadoc/com/parse/ParseQueryAdapter.html
	libs/Parse-1.4.0-javadoc/com/parse/ParseRelation.html
	libs/Parse-1.4.0-javadoc/com/parse/ParseRole.html
	libs/Parse-1.4.0-javadoc/com/parse/ParseTwitterUtils.html
	libs/Parse-1.4.0-javadoc/com/parse/ParseUser.html
	libs/Parse-1.4.0-javadoc/com/parse/ProgressCallback.html
	libs/Parse-1.4.0-javadoc/com/parse/PushService.html
	libs/Parse-1.4.0-javadoc/com/parse/RefreshCallback.html
	libs/Parse-1.4.0-javadoc/com/parse/RequestPasswordResetCallback.html
	libs/Parse-1.4.0-javadoc/com/parse/SaveCallback.html
	libs/Parse-1.4.0-javadoc/com/parse/SendCallback.html
	libs/Parse-1.4.0-javadoc/com/parse/SignUpCallback.html
	libs/Parse-1.4.0-javadoc/com/parse/class-use/CountCallback.html
	libs/Parse-1.4.0-javadoc/com/parse/class-use/DeleteCallback.html
	libs/Parse-1.4.0-javadoc/com/parse/class-use/FindCallback.html
	libs/Parse-1.4.0-javadoc/com/parse/class-use/FunctionCallback.html
	libs/Parse-1.4.0-javadoc/com/parse/class-use/GetCallback.html
	libs/Parse-1.4.0-javadoc/com/parse/class-use/GetDataCallback.html
	libs/Parse-1.4.0-javadoc/com/parse/class-use/LocationCallback.html
	libs/Parse-1.4.0-javadoc/com/parse/class-use/LogInCallback.html
	libs/Parse-1.4.0-javadoc/com/parse/class-use/Parse.html
	libs/Parse-1.4.0-javadoc/com/parse/class-use/ParseACL.html
	libs/Parse-1.4.0-javadoc/com/parse/class-use/ParseAnalytics.html
	libs/Parse-1.4.0-javadoc/com/parse/class-use/ParseAnonymousUtils.html
	libs/Parse-1.4.0-javadoc/com/parse/class-use/ParseClassName.html
	libs/Parse-1.4.0-javadoc/com/parse/class-use/ParseCloud.html
	libs/Parse-1.4.0-javadoc/com/parse/class-use/ParseException.html
	libs/Parse-1.4.0-javadoc/com/parse/class-use/ParseFacebookUtils.html
	libs/Parse-1.4.0-javadoc/com/parse/class-use/ParseFile.html
	libs/Parse-1.4.0-javadoc/com/parse/class-use/ParseGeoPoint.html
	libs/Parse-1.4.0-javadoc/com/parse/class-use/ParseImageView.html
	libs/Parse-1.4.0-javadoc/com/parse/class-use/ParseInstallation.html
	libs/Parse-1.4.0-javadoc/com/parse/class-use/ParseObject.html
	libs/Parse-1.4.0-javadoc/com/parse/class-use/ParsePush.html
	libs/Parse-1.4.0-javadoc/com/parse/class-use/ParseQuery.CachePolicy.html
	libs/Parse-1.4.0-javadoc/com/parse/class-use/ParseQuery.html
	libs/Parse-1.4.0-javadoc/com/parse/class-use/ParseQueryAdapter.OnQueryLoadListener.html
	libs/Parse-1.4.0-javadoc/com/parse/class-use/ParseQueryAdapter.QueryFactory.html
	libs/Parse-1.4.0-javadoc/com/parse/class-use/ParseQueryAdapter.html
	libs/Parse-1.4.0-javadoc/com/parse/class-use/ParseRelation.html
	libs/Parse-1.4.0-javadoc/com/parse/class-use/ParseRole.html
	libs/Parse-1.4.0-javadoc/com/parse/class-use/ParseTwitterUtils.html
	libs/Parse-1.4.0-javadoc/com/parse/class-use/ParseUser.html
	libs/Parse-1.4.0-javadoc/com/parse/class-use/ProgressCallback.html
	libs/Parse-1.4.0-javadoc/com/parse/class-use/PushService.html
	libs/Parse-1.4.0-javadoc/com/parse/class-use/RefreshCallback.html
	libs/Parse-1.4.0-javadoc/com/parse/class-use/RequestPasswordResetCallback.html
	libs/Parse-1.4.0-javadoc/com/parse/class-use/SaveCallback.html
	libs/Parse-1.4.0-javadoc/com/parse/class-use/SendCallback.html
	libs/Parse-1.4.0-javadoc/com/parse/class-use/SignUpCallback.html
	libs/Parse-1.4.0-javadoc/com/parse/package-frame.html
	libs/Parse-1.4.0-javadoc/com/parse/package-summary.html
	libs/Parse-1.4.0-javadoc/com/parse/package-tree.html
	libs/Parse-1.4.0-javadoc/com/parse/package-use.html
	libs/Parse-1.4.0-javadoc/constant-values.html
	libs/Parse-1.4.0-javadoc/deprecated-list.html
	libs/Parse-1.4.0-javadoc/help-doc.html
	libs/Parse-1.4.0-javadoc/index-all.html
	libs/Parse-1.4.0-javadoc/index.html
	libs/Parse-1.4.0-javadoc/overview-tree.html
	libs/Parse-1.4.0-javadoc/package-list
	libs/Parse-1.4.0-javadoc/resources/inherit.gif
	libs/Parse-1.4.0-javadoc/serialized-form.html
	libs/Parse-1.4.0-javadoc/style.css
	libs/Parse-1.4.0.jar
	libs/Parse-1.4.0.jar.properties
	libs/android-support-v4.jar
	libs/third_party_licenses.txt
	proguard-project.txt
	project.properties
	res/drawable-hdpi/ic_action_search.png
	res/drawable-hdpi/ic_launcher.png
	res/drawable-mdpi/ic_action_search.png
	res/drawable-mdpi/ic_launcher.png
	res/drawable-xhdpi/ic_action_search.png
	res/drawable-xhdpi/ic_launcher.png
	res/drawable/login_gradient.xml
	res/layout/activity_feed.xml
	res/layout/activity_login.xml
	res/layout/activity_register.xml
	res/menu/activity_feed.xml
	res/values-v11/styles.xml
	res/values-v14/styles.xml
	res/values/strings.xml
	res/values/styles.xml
	src/com/g08/sonder/LogIn.java
	src/com/g08/sonder/ParseApplication.java
	src/com/g08/sonder/ParseStarterProjectActivity.java
	src/com/g08/sonder/Register.java
changes
Changes for the main menu
More cohesive navigation and parse fixes
a few more adjustments
Merge branch 'master' of https://github.com/SonderSocialNetworking/Android into Jon
merging
Conflicts:
	bin/Sonder.apk
	bin/classes.dex
	bin/resources.ap_