repurchasing fixes
eliminated closing needless closing tags
Merge branch 'angular_upgrade'
Merge branch 'ui-bootstrap-2'
Merging admin into master. Conflicts in companyDocumentList.js companyList.html and grant.html
Merge branch 'setadmin'
bug fix
fewer closes
small fix on doneby
missing quote
wrong modal call
Merge branch 'master' into issue_second_page
style the name field for non document based grants. Fix name display on document based ones
Merge branch 'issue_second_page' into testing