Merge branch 'master' into annotation_types
Merge branch 'master' into annotation_data
Merge branch 'jquery2-angular1.3-upgrade' into annotation_data
Merge branch 'pitch'
Merge branch 'jquery2-angular1.3-upgrade' into annotation_data
Merge branch 'annotation_types' into annotation_data
Merge branch 'master' into annotation_data

Conflicts:
	ownership/js/directives/grantIssue.js
	ownership/partials/grantIssue.html
Merge branch 'master' into testing

Conflicts:
	ownership/js/directives/grantIssue.js