merge conflicts profilelist and draganddrop directive
Merge branch 'master' of https://github.com/kanderek/sidebarDating
merge confilics again...