monitoring popover styling tablet
Merge branch 'master' of git://github.com/Edge5/Edge5AppBackendBundle

Conflicts:
	Resources/public/scss/main.scss