decorators.py:
- need a new decorator require_project_or_site_view_permission since the guardian @permission_required can only check one permission, we need to check project and site perms

models.py:
- BUGFIX:  in ProjectManager get_user_projects(), 'project_id' is an attribute of site, not a key

views.py:
- change uses of guardian decorator permission_required to require_project_or_site_view_permission
- in view_samples, filter sample by user's site view permissions
fix a couple formatting issues, and remove old commented code in view_project_panels
remove instance counts from view_project.html template, they would have to be re-calculated based on site view permissions, and I'm not sure if it's useful to have anyway, since the counts will be shown on the individual list views
views.py: …
- add guardian decorator permission_required to add_visit_type
- add @require_project_or_site_view_permission to view_visit_types view

view_project_visit_types.html:
- add permission checks for add and edit subject links be shown on the individual list views

urls.py:
- make url scheme consistent for collections