Play count, like / unlike
Merge remote-tracking branch 'origin/master'

Conflicts:
	music-web/src/main/java/com/sismics/music/rest/resource/AlbumResource.java