Fixed the problem with the addfriendsactivity

Databases all need different names, all of them have been changed except
for Zack's.  He can change it to be more accurate to being the
dictionary or he can leave it as AtWordsEnd.db.
Tuesday Commit

Commited on tuesday.
Need to add make a game
Merge remote-tracking branch 'origin/master-copy_mason' into Matthew-Copy

Conflicts:
	gen/edu/uark/csce/mzm/atwordsend/R.java