changed the picture path to a path without sub folders.
now the pictures are shown under windows too
fixed thumbnail size / row width bug
Disabled save and discard on interested users tab
Short info pop up added to map on index page
ProfileControllerTest and UserTest adapted to changes
Merge remote-tracking branch 'origin/flo'
Resolving conflict