test
Merge remote-tracking branch 'origin/master'

Conflicts:
	Charity/src/com/friends/charity/model/Login.java