adding smplayer, merge upstrema amarok, calligraplan