style changes
changes
lowered video resolution
Merge branch 'devDesign'

Conflicts:
	public/javascripts/rtc.js