Merge with master - correct some typos, remove unnecessary dependencies in album/artist controllers
merge