Updating Websites

Inlined all FormatMainTests and single "updating other" test in FormatDatabaseTests, removed stanford-sw/test/data/formatTests.mrc and formatDatabaseTests.mrc, left stanford-sw/test/data/formatTests.xml for FormatOldTests since I didn't inline those tests (not sure it is worth the effort if they may be going away anyway...), using formatDatabaseTests.xml for other tests not related to "updating other", changed "updating website" to journal (INDEX-16) and "updating other" to book (INDEX-15)

Also added 3D object resource type (INDEX-18)

@ndushay