Nothing new
Merge branch 'rest_stuff' of https://github.com/rdallman/GroceryGod

Conflicts:
	ABS-library/bin/abs-library.jar
	SlidingMenuActivity/bin/sm-library.jar
Unfinished oAuth
fixed conflicts