Modifying online/offline icons
Resizing offline/online icons to avoid css resizing
Issue #17: doing some minor design integration
Issue #2: static pages are loading from independant template file with html content
Map related issues: adding leaflet settings
Merge branch 'master' into gps_integration

Conflicts:
	app/scripts/app.js