Working on mapserver integration and updating the dashboard
Merge remote-tracking branch 'origin/master'