Geert, Michael : added maps fragment in an extra tab
Merge remote-tracking branch 'origin/master'