init css
fixed merge conflicts
finished basic maps integration
Merge remote-tracking branch 'origin/master' into frontend
Merge remote-tracking branch 'origin/master' into frontend
added test heatmap
minor changes to interface
Merge remote-tracking branch 'origin/master' into frontend
Merge pull request #1 from jzanutto/frontend

Frontend