derby
Merge remote-tracking branch 'LOU/master'

Conflicts:
	Persistence/src/edu/ycp/cs320/awesomepage/server/model/persist/DerbyDatabase.java
	Persistence/src/edu/ycp/cs320/awesomepage/server/model/persist/FakeDatabase.java
	WebApp/src/edu/ycp/cs320/awesomepage/client/StatusPosting.java
friends list stuff but still not working :(
Merge remote-tracking branch 'mike/master'

Conflicts:
	ModelClasses/src/edu/ycp/cs320/awesomepage/shared/FriendsList.java
	Persistence/src/edu/ycp/cs320/awesomepage/server/model/persist/DerbyDatabase.java
	Persistence/src/edu/ycp/cs320/awesomepage/server/model/persist/FakeDatabase.java