More acceptance test stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	Project/database/PhotoBooks.properties
	Project/src/photobooks/presentation/BillsPage.java
	Project/src/photobooks/presentation/MainWindow.java