Added checkin, checkout, confirm activites
Merge remote-tracking branch 'origin/master'

Conflicts:
	Cameron/SquareDev/src/com/alaris/daycare/Activity_HomeScreen.java