Fixes
Merge branch 'custom_modifications' of github.personal:jvazquez/live-monitor into custom_modifications

Conflicts:
	client/scripts/main.js.dist