added unit tests for REST Album/SongController
Merge remote-tracking branch 'origin/master'