add storage in templates
Merge branch 'master' of git@github.com:superizer/hawkeye
in progress
Merge branch 'master' of git@github.com:superizer/hawkeye

Conflicts:
	hawkeye/views/camera.py