Added the admin activity
Small update
Fix
Merge remote-tracking branch 'origin/Cory' -Tim

Conflicts:
	WheresMyStuff/bin/WheresMyStuff.apk
	WheresMyStuff/bin/classes.dex
	WheresMyStuff/bin/classes/com/example/wheresmystuff/LoginActivity$UserLoginTask.class
	WheresMyStuff/bin/classes/com/example/wheresmystuff/LoginActivity.class
	WheresMyStuff/bin/resources.ap_
	WheresMyStuff/gen/com/example/wheresmystuff/R.java