fix add
Merge branch 'master' of ssh://git@github.com/superizer/hawkeye.git

Conflicts:
	hawkeye/views/camera.py