Dont merge. Crahes. Implementing user profile
Still chraches, better implemented
Added my JUnit test
Merge remote-tracking branch 'origin/Chintan8' into peteroffshoot
Merge remote-tracking branch 'origin/cory4' into peteroffshoot

Conflicts:
	WheresMyStuff/bin/WheresMyStuff.apk
	WheresMyStuff/bin/classes.dex
	WheresMyStuff/bin/resources.ap_