renamed song attribute length to duration, due to sql conflict
Merge remote-tracking branch 'origin/master'