xp
Merge remote-tracking branch 'origin/master'

Conflicts:
	edu_senate/src/com/crazysheep/senate/activity/FragmentChangeActivity.java
xp