minor js change
Merge branch 'master' of github.com:borzoj/cctv-webapp
Merge branch 'master' of github.com:borzoj/cctv-webapp
Merge branch 'master' of github.com:borzoj/cctv-webapp
Merge branch 'master' of github.com:borzoj/cctv-webapp
Merge branch 'master' of github.com:borzoj/cctv-webapp
Merge branch 'master' of github.com:borzoj/cctv-webapp
Merge branch 'master' of github.com:borzoj/cctv-webapp
Merge branch 'master' of github.com:borzoj/cctv-webapp
Merge branch 'master' of github.com:borzoj/cctv-webapp
Merge branch 'master' of github.com:borzoj/cctv-webapp

Conflicts:
	cctv/static/assets/scripts/app.js