Added Genre and Genre service
Resolved merge conflict in album