Conflicts: circle/dashboard/static/dashboard/vm-common.js circle/dashboard/templates/dashboard/store/index-files.html
Merge branch 'master' into issue-364 · 1a9d84cd