example json
Merge branch 'master' of git@github.com:superizer/hawkeye.git

Conflicts:
	hawkeye/templates/camera/add-camera.mako