roll back

deleted too many files last time
Let's see if this worked...
Merge branch 'master' of https://github.com/heathj/Rideboard

Conflicts:
	App/bin/AndroidManifest.xml
	App/bin/classes/rideboard/project/space/BuildConfig.class
	App/bin/classes/rideboard/project/space/CreateRide.class
	App/bin/classes/rideboard/project/space/EditProfile.class
	App/bin/classes/rideboard/project/space/Help.class
	App/bin/classes/rideboard/project/space/Login.class
	App/bin/classes/rideboard/project/space/MainMenu.class
	App/bin/classes/rideboard/project/space/Posts.class
	App/bin/classes/rideboard/project/space/Profile.class
	App/bin/classes/rideboard/project/space/R$attr.class
	App/bin/classes/rideboard/project/space/R$drawable.class
	App/bin/classes/rideboard/project/space/R$id.class
	App/bin/classes/rideboard/project/space/R$layout.class
	App/bin/classes/rideboard/project/space/R$string.class
	App/bin/classes/rideboard/project/space/R.class
	App/res/drawable-ldpi/ic_launcher.png.orig