overview, priority, and other changes
Merge branch 'master' of https://github.com/eblipsky/NOW-web

Conflicts:
	laravel/app/views/hpc/file_info.twig