cc
Merge branch 'master' of github.com:overlox/openhangouts

Conflicts:
	public/system/views/index.html
dashbaord