Merge branch 'pepf-master'
create global template: userLink
update packages
load the playlist template during loading of the songs
do the data joining in the controller, also fixes #56
Friend feature, simpleSchema extension