Misc changes made to Senate Activity
Merge branch 'dev' of https://github.com/nysenate/InventoryMobileApp.git
into dev

Conflicts:
	src/gov/nysenate/inventory/activity/SenateActivity.java