2014.12.07 Meeting (Update II)

New classes from Odyssey's copy uploaded.
Merge remote-tracking branch 'origin/master'

Conflicts:

	20141123SoundSearch230/src/main/java/com/mycompany/soundsearch230/SearchResultPage.java