.
mergeMerge branch 'master' of https://github.com/eucalyptus-RHoK/donate_my-school-stuff

Conflicts:
	android-client/gen/com/rhok/donatemyschoolstuff/R.java
Merge branch 'master' of https://github.com/eucalyptus-RHoK/donate_my-school-stuff