workaround iframe not loading #617
Merge branch 'develop'

Conflicts:
	sjfnw/templates/grants/org_app.html
merging info page workaround from master into develop