Syncing Art and Hanrui's stuff for th emost part. Renamed files to not include 'activity' too.

Few html files for admin began, not much in them done yet though.
Merge branch 'master' of https://github.com/arthurchang/RaiseYourHand

Conflicts:
	gen/com/raiseyourhand/R.java