CSS changes
Merge branch 'master' of https://github.com/jean28/Sentinel-WebApplication

Conflicts:
	incidents-es.html
	index.html
fasdf
Merge branch 'master' of https://github.com/jean28/Sentinel-WebApplication
Somechanges