Merge branch 'develop-testingupdates'

Conflicts:
	sjfnw/templates/admin/index.html
using version 2 to be safe
Merge branch 'develop'

Conflicts:
	app.yaml
Merge branch 'develop'
fix #602 progress chart colors
update keyword name in overdue steps view. fixes bug
handle form errors, show correct form upon reload. #607
fixed year fields error #607
more emphasis on report type #607
make default start year be this year -1 #607
include sponsored pr grant ids. cursor change for fields with help text. #607
trailing spaces
bug fixes for reporting tests: correctly fill in org name, inclusive years. #605