Merge remote-tracking branch 'LOU/master'

Conflicts:
	Persistence/src/edu/ycp/cs320/awesomepage/server/model/persist/FakeDatabase.java
Merge remote-tracking branch 'mike/master'