Minor fix
Left/Right margins affect HT/CHT/CBT
Merge branch 'develop'

Conflicts:
	modules/session_components/screen.js